From eed18e07b5b50a2da5c4559309ee2c92a9d392d1 Mon Sep 17 00:00:00 2001 From: Elliott Slaughter <slaughter@cs.stanford.edu> Date: Wed, 24 Jul 2024 13:57:10 -0700 Subject: [PATCH] Avoid hard-coding CC/CXX in setup.sh. --- experiment/frontier/env.sh | 2 ++ experiment/perlmutter/env.sh | 2 ++ experiment/sapling/env.sh | 2 ++ experiment/setup.sh | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/experiment/frontier/env.sh b/experiment/frontier/env.sh index c7c0d6c..de69147 100644 --- a/experiment/frontier/env.sh +++ b/experiment/frontier/env.sh @@ -5,6 +5,8 @@ module swap $LMOD_FAMILY_PRGENV PrgEnv-gnu module load rocm/6.0.0 module unload darshan-runtime +export CC=cc CXX=CC HOST_CC=gcc HOST_CXX=g++ + export USE_HIP=1 export CONDUIT=ofi-slingshot11 diff --git a/experiment/perlmutter/env.sh b/experiment/perlmutter/env.sh index a07dfec..b099a1f 100644 --- a/experiment/perlmutter/env.sh +++ b/experiment/perlmutter/env.sh @@ -5,6 +5,8 @@ module load PrgEnv-gnu module load cpe-cuda module load cudatoolkit +export CC=cc CXX=CC HOST_CC=gcc HOST_CXX=g++ + export USE_CUDA=1 export CONDUIT=ofi-slingshot11 diff --git a/experiment/sapling/env.sh b/experiment/sapling/env.sh index 8d56e82..ff2f9c4 100644 --- a/experiment/sapling/env.sh +++ b/experiment/sapling/env.sh @@ -3,6 +3,8 @@ export THREADS=20 module load cuda +export CC=gcc CXX=g++ + export USE_CUDA=1 export CONDUIT=ibv diff --git a/experiment/setup.sh b/experiment/setup.sh index 0d5e205..cb6e6ba 100755 --- a/experiment/setup.sh +++ b/experiment/setup.sh @@ -23,7 +23,7 @@ fi pushd legion/language # setup_env.py pins everything now, so don't need to pin explicitly here -DEBUG=0 CC=cc CXX=CC HOST_CC=gcc HOST_CXX=g++ USE_GASNET=1 REALM_NETWORKS=gasnetex ./scripts/setup_env.py --cmake --extra="-DCMAKE_INSTALL_PREFIX=$PWD/../install" --install -j${THREADS:-16} +DEBUG=0 USE_GASNET=1 REALM_NETWORKS=gasnetex ./scripts/setup_env.py --cmake --extra="-DCMAKE_INSTALL_PREFIX=$PWD/../install" --install -j${THREADS:-16} popd extra_cxxflags=