Skip to content

Commit

Permalink
Merge pull request #19 from SC-SGS/fix-jenkins
Browse files Browse the repository at this point in the history
Fix jenkins
  • Loading branch information
G-071 authored May 26, 2023
2 parents b0a8f63 + b7ca141 commit bae9813
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .jenkins/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ pipeline {
sh '''
git submodule update --init --recursive
./scripts/clean_dependencies.sh
rm -rf build
'''
}
}
Expand Down Expand Up @@ -72,6 +73,7 @@ pipeline {
steps {
dir('CPPuddle') {
sh '''
. /usr/local.nfs/Modules/latest/init/sh
module load cuda
#./scripts/build_dependencies.sh ${build_type} ${compiler}
'''
Expand All @@ -82,6 +84,7 @@ pipeline {
steps {
dir('CPPuddle') {
sh '''
. /usr/local.nfs/Modules/latest/init/sh
module load cuda
./scripts/configure_build_directory.sh ${build_type} ${compiler}
cd build/${compiler}-${build_type}
Expand All @@ -94,6 +97,7 @@ pipeline {
steps {
dir('CPPuddle') {
sh '''
. /usr/local.nfs/Modules/latest/init/sh
module load cuda
cd build/${compiler}-${build_type}
ctest -j4
Expand Down
4 changes: 3 additions & 1 deletion scripts/machine_configs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ function source_config_pcsgs0x() {
SCRIPTS_DIR="$1"
export CMAKE_BUILD_TYPE="$2"
if [[ "${3}" == "gcc" ]]; then
export CXX=${SCRIPTS_DIR}/../external_dependencies/kokkos/bin/nvcc_wrapper
# temporarily disable kokkos
#export CXX=${SCRIPTS_DIR}/../external_dependencies/kokkos/bin/nvcc_wrapper
export CXX="g++"
export HPX_COMPILER="g++"
elif [[ "${3}" == "clang" ]]; then
export CXX=clang++
Expand Down

0 comments on commit bae9813

Please sign in to comment.