Unverified Commit c4882b28 authored by Atkins, Charles Vernon's avatar Atkins, Charles Vernon Committed by GitHub
Browse files

Merge pull request #372 from chuckatkins/fix-cori-builds

Fix cori builds
parents 67918fa4 7a57dbc6
......@@ -3,7 +3,7 @@ set(CTEST_SITE "cori.nersc.gov")
set(CTEST_BUILD_CONFIGURATION Release)
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
set(CTEST_BUILD_FLAGS "-k -j10")
set(CTEST_TEST_ARGS PARALLEL_LEVEL 10)
set(CTEST_TEST_ARGS PARALLEL_LEVEL 1)
set(CTEST_BUILD_NAME "Linux-CrayCLE6-KNL_Cray_MPICH")
set(dashboard_model Nightly)
......@@ -15,6 +15,7 @@ module(purge)
module(load modules)
module(load craype)
module(load PrgEnv-cray)
module(swap cce cce/8.6.2)
module(load craype-mic-knl)
module(load cray-mpich)
module(load cray-hdf5-parallel)
......@@ -24,7 +25,6 @@ module(load git)
set(ENV{CC} cc)
set(ENV{CXX} CC)
set(ENV{FC} ftn)
set(ENV{CRAYPE_LINK_TYPE} dynamic)
set(dashboard_cache "
#ADIOS2_USE_ADIOS1:STRING=ON
......@@ -33,7 +33,7 @@ ADIOS2_USE_DataMan:STRING=ON
ADIOS2_USE_Fortran:STRING=ON
ADIOS2_USE_HDF5:STRING=ON
ADIOS2_USE_MPI:STRING=ON
ADIOS2_USE_Python:STRING=ON
#ADIOS2_USE_Python:STRING=ON
#ADIOS2_USE_ZFP:STRING=ON
#ADIOS2_USE_ZeroMQ:STRING=ON
......
......@@ -3,7 +3,7 @@ set(CTEST_SITE "cori.nersc.gov")
set(CTEST_BUILD_CONFIGURATION Release)
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
set(CTEST_BUILD_FLAGS "-k -j10")
set(CTEST_TEST_ARGS PARALLEL_LEVEL 10)
set(CTEST_TEST_ARGS PARALLEL_LEVEL 1)
set(CTEST_BUILD_NAME "Linux-CrayCLE6-KNL_GCC_MPICH")
set(dashboard_model Nightly)
......@@ -24,7 +24,6 @@ module(load git)
set(ENV{CC} cc)
set(ENV{CXX} CC)
set(ENV{FC} ftn)
set(ENV{CRAYPE_LINK_TYPE} dynamic)
set(dashboard_cache "
#ADIOS2_USE_ADIOS1:STRING=ON
......@@ -33,7 +32,7 @@ ADIOS2_USE_DataMan:STRING=ON
ADIOS2_USE_Fortran:STRING=ON
ADIOS2_USE_HDF5:STRING=ON
ADIOS2_USE_MPI:STRING=ON
ADIOS2_USE_Python:STRING=ON
#ADIOS2_USE_Python:STRING=ON
#ADIOS2_USE_ZFP:STRING=ON
#ADIOS2_USE_ZeroMQ:STRING=ON
......
......@@ -3,7 +3,7 @@ set(CTEST_SITE "cori.nersc.gov")
set(CTEST_BUILD_CONFIGURATION Release)
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
set(CTEST_BUILD_FLAGS "-k -j10")
set(CTEST_TEST_ARGS PARALLEL_LEVEL 10)
set(CTEST_TEST_ARGS PARALLEL_LEVEL 1)
set(CTEST_BUILD_NAME "Linux-CrayCLE6-KNL_Intel_MPICH")
set(dashboard_model Nightly)
......@@ -24,7 +24,6 @@ module(load git)
set(ENV{CC} cc)
set(ENV{CXX} CC)
set(ENV{FC} ftn)
set(ENV{CRAYPE_LINK_TYPE} dynamic)
set(dashboard_cache "
#ADIOS2_USE_ADIOS1:STRING=ON
......@@ -33,7 +32,7 @@ ADIOS2_USE_DataMan:STRING=ON
ADIOS2_USE_Fortran:STRING=ON
ADIOS2_USE_HDF5:STRING=ON
ADIOS2_USE_MPI:STRING=ON
ADIOS2_USE_Python:STRING=ON
#ADIOS2_USE_Python:STRING=ON
#ADIOS2_USE_ZFP:STRING=ON
#ADIOS2_USE_ZeroMQ:STRING=ON
......
#!/bin/bash
#SBATCH -A m1248
#SBATCH -A m2886
#SBATCH -p debug
#SBATCH -N 2
#SBATCH -t 0:01:00
#SBATCH -t 0:30:00
#SBATCH -n 8
#SBATCH -J adios_nightly
#SBATCH -C knl,quad,cache
......
......@@ -77,11 +77,13 @@ ${CTEST} -VV -S ${SCRIPT_DIR}/cori-gcc-mpich.cmake \
-Ddashboard_do_test=ON \
-Ddashboard_do_submit_only=ON 2>&1 1>>Logs/cori-gcc-mpich.log
log "Submitting Parallel Intel Test Results"
${CTEST} -VV -S ${SCRIPT_DIR}/cori-intel-mpich.cmake \
-Ddashboard_full=OFF \
-Ddashboard_do_test=ON \
-Ddashboard_do_submit_only=ON 2>&1 1>>Logs/cori-intel-mpich.log
log "Submitting Parallel Cray Test Results"
${CTEST} -VV -S ${SCRIPT_DIR}/cori-cray-mpich.cmake \
-Ddashboard_full=OFF \
-Ddashboard_do_test=ON \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment