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

LLVM libomptarget fixes (#16104)

Browse Source 
* Throw an error at spack install invocation instead of most of the way through the build process when cuda_arch is unspecified.

* Clean-up of CMake booleans. No actual change.

* Use CMake variables for hwloc and libelf installation directories and avoid injecting extra flags into CMAKE_CXX_FLAGS

* Conflict should only exist for +cuda variant.
This commit is contained in:
Nichols A. Romero 2020-04-17 15:18:27 -05:00 committed by GitHub
parent ac54b7d5c1
commit ebd86bd1eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
var/spack/repos/builtin/packages/llvm/package.py
View File

@ -170,6 +170,9 @@ class Llvm(CMakePackage, CudaPackage):
# OMP TSAN exists in > 5.x # OMP TSAN exists in > 5.x
conflicts("+omp_tsan", when="@:5.99") conflicts("+omp_tsan", when="@:5.99")
# cuda_arch value must be specified
conflicts("cuda_arch=none", when="+cuda", msg="A value for cuda_arch must be specified.")
# MLIR exists in > 10.x # MLIR exists in > 10.x
conflicts("+mlir", when="@:9") conflicts("+mlir", when="@:9")
@ -233,7 +236,8 @@ def cmake_args(self):
"-DLLVM_ENABLE_EH:BOOL=ON", "-DLLVM_ENABLE_EH:BOOL=ON",
"-DCLANG_DEFAULT_OPENMP_RUNTIME:STRING=libomp", "-DCLANG_DEFAULT_OPENMP_RUNTIME:STRING=libomp",
"-DPYTHON_EXECUTABLE:PATH={0}".format(spec["python"].command.path), "-DPYTHON_EXECUTABLE:PATH={0}".format(spec["python"].command.path),
"-DLIBOMP_USE_HWLOC=On", "-DLIBOMP_USE_HWLOC:BOOL=ON",
"-DLIBOMP_HWLOC_INSTALL_DIR={0}".format(spec["hwloc"].prefix),
] ]
projects = [] projects = []
@ -388,13 +392,14 @@ def post_install(self):
"-DCMAKE_INSTALL_PREFIX:PATH={0}".format(spec.prefix), "-DCMAKE_INSTALL_PREFIX:PATH={0}".format(spec.prefix),
] ]
cmake_args.extend(self.cmake_args()) cmake_args.extend(self.cmake_args())
cmake_args.append('-DLIBOMPTARGET_NVPTX_ENABLE_BCLIB=true') cmake_args.append(
"-DLIBOMPTARGET_NVPTX_ENABLE_BCLIB:BOOL=TRUE"
)
# work around bad libelf detection in libomptarget # work around bad libelf detection in libomptarget
cmake_args.append( cmake_args.append(
"-DCMAKE_CXX_FLAGS:String=-I{0} -I{1}".format( "-DLIBOMPTARGET_DEP_LIBELF_INCLUDE_DIR:String={0}".format(
spec["libelf"].prefix.include, spec["libelf"].prefix.include
spec["hwloc"].prefix.include,
) )
) )