Merge branch 'develop' into fix-opt-countingjas

This commit is contained in:
Paul R. C. Kent 2022-08-29 13:15:23 -04:00 committed by GitHub
commit 7cc7b3b14f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions

View File

@ -119,10 +119,10 @@ jobs:
GCC8-NoMPI-Legacy-CUDA-Complex-Mixed,
GCC8-NoMPI-Legacy-CUDA-Real, # full precision
GCC8-NoMPI-Legacy-CUDA-Complex,
Clang14-MPI-CUDA-AFQMC-Offload-Real-Mixed, # auxiliary field, offload requires llvm14
Clang14-MPI-CUDA-AFQMC-Offload-Real,
Clang14-MPI-CUDA-AFQMC-Offload-Complex-Mixed,
Clang14-MPI-CUDA-AFQMC-Offload-Complex,
Clang15-MPI-CUDA-AFQMC-Offload-Real-Mixed, # auxiliary field, offload requires llvm14
Clang15-MPI-CUDA-AFQMC-Offload-Real,
Clang15-MPI-CUDA-AFQMC-Offload-Complex-Mixed,
Clang15-MPI-CUDA-AFQMC-Offload-Complex,
Intel19-MPI-CUDA-AFQMC-Real-Mixed, # auxiliary field, requires MPI
Intel19-MPI-CUDA-AFQMC-Complex-Mixed,
Intel19-MPI-CUDA-AFQMC-Real,

View File

@ -162,19 +162,20 @@ case "$1" in
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
${GITHUB_WORKSPACE}
;;
*"Clang14-MPI-CUDA-AFQMC-Offload"*)
*"Clang15-MPI-CUDA-AFQMC-Offload"*)
echo "Configure for building with ENABLE_CUDA and AFQMC using OpenMP offload on x86_64 " \
"with latest llvm, need built-from-source OpenBLAS due to bug in rpm"
export OMPI_CC=/opt/llvm/14.0.1/bin/clang
export OMPI_CXX=/opt/llvm/14.0.1/bin/clang++
# todo: update to llvm 15 release, currently using release candidate
export OMPI_CC=/opt/llvm/15.0.0-rc3/bin/clang
export OMPI_CXX=/opt/llvm/15.0.0-rc3/bin/clang++
# Make current environment variables available to subsequent steps
echo "OMPI_CC=/opt/llvm/14.0.1/bin/clang" >> $GITHUB_ENV
echo "OMPI_CXX=/opt/llvm/14.0.1/bin/clang++" >> $GITHUB_ENV
echo "OMPI_CC=/opt/llvm/15.0.0-rc3/bin/clang" >> $GITHUB_ENV
echo "OMPI_CXX=/opt/llvm/15.0.0-rc3/bin/clang++" >> $GITHUB_ENV
# Confirm that cuda 11.2 gets picked up by the compiler
/opt/llvm/14.0.1/bin/clang++ -v
/opt/llvm/15.0.0-rc3/bin/clang++ -v
cmake -GNinja \
-DCMAKE_C_COMPILER=/usr/lib64/openmpi/bin/mpicc \
@ -183,7 +184,6 @@ case "$1" in
-DBUILD_AFQMC=ON \
-DENABLE_CUDA=ON \
-DENABLE_OFFLOAD=ON \
-DUSE_OBJECT_TARGET=ON \
-DCMAKE_PREFIX_PATH="/opt/OpenBLAS/0.3.18" \
-DQMC_COMPLEX=$IS_COMPLEX \
-DQMC_MIXED_PRECISION=$IS_MIXED_PRECISION \