zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lbann (and related stack): avoid bug in cmake 3.23.0 (#30019)

Browse Source
This commit is contained in:
Brian Van Essen 2022-04-11 23:56:48 -07:00 committed by GitHub
parent 8d56728984
commit 433d404a93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/aluminum/package.py
View File

@ -62,11 +62,15 @@ def cmake_args(self):
spec = self.spec spec = self.spec
args = [ args = [
'-DCMAKE_CXX_STANDARD:STRING=17', '-DCMAKE_CXX_STANDARD:STRING=17',
'-DCMAKE_EXPORT_COMPILE_COMMANDS=ON',
'-DALUMINUM_ENABLE_CUDA:BOOL=%s' % ('+cuda' in spec), '-DALUMINUM_ENABLE_CUDA:BOOL=%s' % ('+cuda' in spec),
'-DALUMINUM_ENABLE_NCCL:BOOL=%s' % ('+nccl' in spec or '+rccl' in spec), '-DALUMINUM_ENABLE_NCCL:BOOL=%s' % ('+nccl' in spec or '+rccl' in spec),
'-DALUMINUM_ENABLE_ROCM:BOOL=%s' % ('+rocm' in spec)] '-DALUMINUM_ENABLE_ROCM:BOOL=%s' % ('+rocm' in spec)]
if not spec.satisfies('^cmake@3.23.0'):
# There is a bug with using Ninja generator in this version
# of CMake
args.append('-DCMAKE_EXPORT_COMPILE_COMMANDS=ON')
if '+cuda' in spec: if '+cuda' in spec:
if self.spec.satisfies('%clang'): if self.spec.satisfies('%clang'):
for flag in self.spec.compiler_flags['cxxflags']: for flag in self.spec.compiler_flags['cxxflags']:

6
var/spack/repos/builtin/packages/dihydrogen/package.py
View File

@ -141,7 +141,6 @@ def cmake_args(self):
args = [ args = [
'-DCMAKE_CXX_STANDARD=17', '-DCMAKE_CXX_STANDARD=17',
'-DCMAKE_EXPORT_COMPILE_COMMANDS=ON',
'-DCMAKE_INSTALL_MESSAGE:STRING=LAZY', '-DCMAKE_INSTALL_MESSAGE:STRING=LAZY',
'-DBUILD_SHARED_LIBS:BOOL=%s' % ('+shared' in spec), '-DBUILD_SHARED_LIBS:BOOL=%s' % ('+shared' in spec),
'-DH2_ENABLE_ALUMINUM=%s' % ('+al' in spec), '-DH2_ENABLE_ALUMINUM=%s' % ('+al' in spec),
@ -153,6 +152,11 @@ def cmake_args(self):
'-DH2_DEVELOPER_BUILD=%s' % ('+developer' in spec), '-DH2_DEVELOPER_BUILD=%s' % ('+developer' in spec),
] ]
if not spec.satisfies('^cmake@3.23.0'):
# There is a bug with using Ninja generator in this version
# of CMake
args.append('-DCMAKE_EXPORT_COMPILE_COMMANDS=ON')
if '+cuda' in spec: if '+cuda' in spec:
if self.spec.satisfies('%clang'): if self.spec.satisfies('%clang'):
for flag in self.spec.compiler_flags['cxxflags']: for flag in self.spec.compiler_flags['cxxflags']:

6
var/spack/repos/builtin/packages/hydrogen/package.py
View File

@ -149,7 +149,6 @@ def cmake_args(self):
args = [ args = [
'-DCMAKE_CXX_STANDARD=17', '-DCMAKE_CXX_STANDARD=17',
'-DCMAKE_EXPORT_COMPILE_COMMANDS=ON',
'-DCMAKE_INSTALL_MESSAGE:STRING=LAZY', '-DCMAKE_INSTALL_MESSAGE:STRING=LAZY',
'-DBUILD_SHARED_LIBS:BOOL=%s' % ('+shared' in spec), '-DBUILD_SHARED_LIBS:BOOL=%s' % ('+shared' in spec),
'-DHydrogen_ENABLE_OPENMP:BOOL=%s' % ('+openmp' in spec), '-DHydrogen_ENABLE_OPENMP:BOOL=%s' % ('+openmp' in spec),
@ -167,6 +166,11 @@ def cmake_args(self):
'-DHydrogen_ENABLE_GPU_FP16=%s' % enable_gpu_fp16, '-DHydrogen_ENABLE_GPU_FP16=%s' % enable_gpu_fp16,
] ]
if not spec.satisfies('^cmake@3.23.0'):
# There is a bug with using Ninja generator in this version
# of CMake
args.append('-DCMAKE_EXPORT_COMPILE_COMMANDS=ON')
if '+cuda' in spec: if '+cuda' in spec:
if self.spec.satisfies('%clang'): if self.spec.satisfies('%clang'):
for flag in self.spec.compiler_flags['cxxflags']: for flag in self.spec.compiler_flags['cxxflags']:

6
var/spack/repos/builtin/packages/lbann/package.py
View File

@ -289,7 +289,6 @@ def cmake_args(self):
args = self.common_config_args args = self.common_config_args
args.extend([ args.extend([
'-DCMAKE_CXX_STANDARD=17', '-DCMAKE_CXX_STANDARD=17',
'-DCMAKE_EXPORT_COMPILE_COMMANDS=ON',
'-DLBANN_WITH_CNPY=%s' % ('+numpy' in spec), '-DLBANN_WITH_CNPY=%s' % ('+numpy' in spec),
'-DLBANN_DETERMINISTIC:BOOL=%s' % ('+deterministic' in spec), '-DLBANN_DETERMINISTIC:BOOL=%s' % ('+deterministic' in spec),
'-DLBANN_WITH_HWLOC=%s' % ('+hwloc' in spec), '-DLBANN_WITH_HWLOC=%s' % ('+hwloc' in spec),
@ -313,6 +312,11 @@ def cmake_args(self):
'-DProtobuf_DIR={0}'.format(spec['protobuf'].prefix), '-DProtobuf_DIR={0}'.format(spec['protobuf'].prefix),
'-Dprotobuf_MODULE_COMPATIBLE=ON']) '-Dprotobuf_MODULE_COMPATIBLE=ON'])
if not spec.satisfies('^cmake@3.23.0'):
# There is a bug with using Ninja generator in this version
# of CMake
args.append('-DCMAKE_EXPORT_COMPILE_COMMANDS=ON')
if '+cuda' in spec: if '+cuda' in spec:
if self.spec.satisfies('%clang'): if self.spec.satisfies('%clang'):
for flag in self.spec.compiler_flags['cxxflags']: for flag in self.spec.compiler_flags['cxxflags']: