Skip to content

Commit 7479dd4

Browse files
committed
Add AdaptiveCpp to the container
1 parent 9ed1eff commit 7479dd4

File tree

1 file changed

+8
-23
lines changed

1 file changed

+8
-23
lines changed

ci/recipe.py

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
nvhpc_ver = '24.3'
77
cuda_ver = '12.3'
88
gcc_ver = '13'
9-
llvm_ver = '19'
9+
llvm_ver = '18'
1010
cmake_ver = '3.27.2'
1111
boost_ver = '1.75.0'
1212

@@ -101,34 +101,19 @@
101101
})
102102

103103
# Install AdaptiveCpp stdpar:
104-
if False:
105-
Stage0 += boost(version=boost_ver)
106-
Stage0 += shell(commands=[
104+
Stage0 += boost(version=boost_ver)
105+
Stage0 += shell(commands=[
107106
'set -ex',
108107
'git clone --recurse-submodules -b develop https://github.com/AdaptiveCpp/AdaptiveCpp',
109108
'cd AdaptiveCpp',
110109
'git submodule update --recursive',
111110
f'cmake -Bbuild -H. -DCMAKE_C_COMPILER="$(which clang-{llvm_ver})" -DCMAKE_CXX_COMPILER="$(which clang++-{llvm_ver})" -DCMAKE_INSTALL_PREFIX=/opt/adaptivecpp -DWITH_CUDA_BACKEND=ON -DWITH_CPU_BACKEND=ON',
112111
'cmake --build build --target install -j $(nproc)',
113-
])
114-
# And https://github.com/llvm/llvm-project/issues/57544
115-
Stage0 += raw(docker=f'''
116-
COPY <<EOF /usr/lib/clang/{llvm_ver}/include/cuda_wrappers/bits/shared_ptr_base.h
117-
// clang/lib/Headers/cuda_wrappers/bits/shared_ptr_base.h
118-
// installs to /usr/lib/clang/{llvm_ver}/include/cuda_wrappers/bits/shared_ptr_base.h
119-
120-
// CUDA headers define __noinline__ which interferes with libstdc++'s use of
121-
// `__attribute((__noinline__))`. In order to avoid compilation error,
122-
// temporarily unset __noinline__ when we include affected libstdc++ header.
123-
124-
#pragma push_macro("__noinline__")
125-
#undef __noinline__
126-
#include_next "bits/shared_ptr_base.h"
127-
128-
#pragma pop_macro("__noinline__")
129-
EOF
130-
''')
131-
112+
])
113+
Stage0 += environment(variables={
114+
'PATH':'$PATH:/opt/adaptivecpp/bin',
115+
'ACPP_APPDB_DIR': '/src/',
116+
})
132117

133118
Stage0 += shell(commands=[
134119
f'echo "#define MDSPAN_USE_PAREN_OPERATOR 1"|cat - /opt/nvidia/hpc_sdk/Linux_{arch}/{nvhpc_ver}/compilers/include/experimental/mdspan > /tmp/out && mv /tmp/out /opt/nvidia/hpc_sdk/Linux_{arch}/{nvhpc_ver}/compilers/include/experimental/mdspan',

0 commit comments

Comments
 (0)