Merge branch 'master' into fix_arm

SC-SGS · May 26, 2023 · 9fbf08c · 9fbf08c
2 parents e27b8cd + bae9813
commit 9fbf08c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile
@@ -31,6 +31,7 @@ pipeline {
                     sh '''
                         git submodule update --init --recursive
                         ./scripts/clean_dependencies.sh
+                        rm -rf build
                     '''
                 }
             }
@@ -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}
                                 '''
@@ -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}
@@ -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

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -57,7 +57,6 @@ if (CPPUDDLE_WITH_KOKKOS)
   endif()
 
   kokkos_check(DEVICES HPX)
-  kokkos_check(OPTIONS HPX_ASYNC_DISPATCH)
 endif()
 
 # Add Linter warnings

diff --git a/scripts/machine_configs.sh b/scripts/machine_configs.sh
@@ -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++
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,7 +57,6 @@ if (CPPUDDLE_WITH_KOKKOS) @@
       endif()
       kokkos_check(DEVICES HPX)
-      kokkos_check(OPTIONS HPX_ASYNC_DISPATCH)
     endif()
     # Add Linter warnings
@@ Expand Down @@