Skip to content

Commit

Permalink
Fix IL compile by default-disabling linker tricks, bump IL NPROC
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben Prather committed Aug 17, 2023
1 parent 4a4b493 commit db690b3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 2 additions & 0 deletions machines/illinois.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ elif [[ $HOST == *".astro.illinois.edu" ]]; then
HOST_ARCH="ZEN2"
# BH29 benefits from using just 1 thread/core
export OMP_NUM_THREADS=64
NPROC=64
else
# Other machines are Skylake
HOST_ARCH="SKX"
NPROC=36
fi

# Compile our own HDF5 by default
Expand Down
11 changes: 5 additions & 6 deletions make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ if [[ -z "$CXX_NATIVE" ]]; then
elif which icpx >/dev/null 2>&1; then
CXX_NATIVE=icpx
C_NATIVE=icx
OMP_FLAG="-fopenmp"
OMP_FLAG="-fiopenmp"
elif which icpc >/dev/null 2>&1; then
CXX_NATIVE=icpc
C_NATIVE=icc
Expand Down Expand Up @@ -200,9 +200,10 @@ fi
# Allow for a custom linker program, but use CXX by
# default as system linker may be older/incompatible
if [[ -v LINKER ]]; then
LINKER="$LINKER"
else
LINKER="$CXX"
EXTRA_FLAGS="-DCMAKE_LINKER=$LINKER"
fi
if [[ "$ARGS" == *"special_link_line"* ]]; then
EXTRA_FLAGS="-DCMAKE_CXX_LINK_EXECUTABLE='<CMAKE_LINKER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>'"
fi

# Avoid warning on nvcc pragmas Intel doesn't like
Expand Down Expand Up @@ -298,8 +299,6 @@ if [[ "$ARGS" == *"clean"* ]]; then
cmake ..\
-DCMAKE_C_COMPILER="$CC" \
-DCMAKE_CXX_COMPILER="$CXX" \
-DCMAKE_LINKER="$LINKER" \
-DCMAKE_CXX_LINK_EXECUTABLE='<CMAKE_LINKER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>' \
-DCMAKE_PREFIX_PATH="$PREFIX_PATH;$CMAKE_PREFIX_PATH" \
-DCMAKE_BUILD_TYPE=$TYPE \
-DPAR_LOOP_LAYOUT=$OUTER_LAYOUT \
Expand Down

0 comments on commit db690b3

Please sign in to comment.