Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test_all_sandia, generate_makefile updates #321

Merged
merged 1 commit into from
Oct 9, 2018
Merged

test_all_sandia, generate_makefile updates #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions scripts/generate_makefile.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ do
--with-offsets*)
KOKKOSKERNELS_OFFSETS="${key#*=}"
;;
--with-layouts*)
KOKKOSKERNELS_LAYOUTS="${key#*=}"
;;
--with-options*)
KOKKOSKERNELS_OPTIONS="${key#*=}"
;;
Expand All @@ -132,6 +135,7 @@ do
echo "--with-scalars=[SCALARS]: Set scalars to be instantiated."
echo "--with-ordinals=[ORDINALS]: Set ordinals to be instantiated."
echo "--with-offsets=[OFFSETS]: Set offsets to be instantiated."
echo "--with-layouts=[LAYOUTS]: Set layouts to be instantiated (LayoutLeft,LayoutRight)."
echo "--prefix=/Install/Path: Path to install the Kokkos library."
echo "--with-options=[OPT]: Set KokkosKernels Options:"
echo " eti_only: only allow ETI types to be enabled [default]"
Expand Down
24 changes: 13 additions & 11 deletions scripts/test_all_sandia
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,18 @@ do
--ldflags-extra*)
LD_FLAGS_EXTRA="${key#*=}"
;;
--with-scalars*)
KOKKOSKERNELS_SCALARS="${key#*=}"
;;
--with-ordinals*)
KOKKOSKERNELS_ORDINALS="${key#*=}"
;;
--with-offsets*)
KOKKOSKERNELS_OFFSETS="${key#*=}"
;;
--with-layouts*)
KOKKOSKERNELS_LAYOUTS="${key#*=}"
;;
--with-tpls*)
KOKKOSKERNELS_ENABLE_TPLS="${key#*=}"
;;
Expand Down Expand Up @@ -247,8 +259,6 @@ elif [ "$MACHINE" = "white" ]; then
ARCH_FLAG="--arch=Power8,Kepler37"
fi

NUM_JOBS_TO_RUN_IN_PARALLEL=2

elif [ "$MACHINE" = "bowman" ]; then
source /etc/profile.d/modules.sh
SKIP_HWLOC=True
Expand All @@ -268,8 +278,6 @@ elif [ "$MACHINE" = "bowman" ]; then
ARCH_FLAG="--arch=KNL"
fi

NUM_JOBS_TO_RUN_IN_PARALLEL=2

elif [ "$MACHINE" = "mayer" ]; then
SKIP_HWLOC=True
export SLURM_TASKS_PER_NODE=96
Expand All @@ -286,8 +294,6 @@ elif [ "$MACHINE" = "mayer" ]; then
ARCH_FLAG="--arch=ARMv8-TX2"
fi

NUM_JOBS_TO_RUN_IN_PARALLEL=1

elif [ "$MACHINE" = "blake" ]; then
source /etc/profile.d/modules.sh
SKIP_HWLOC=True
Expand Down Expand Up @@ -319,8 +325,6 @@ elif [ "$MACHINE" = "blake" ]; then
fi
fi

NUM_JOBS_TO_RUN_IN_PARALLEL=2

elif [ "$MACHINE" = "apollo" ]; then
source /projects/sems/modulefiles/utils/sems-modules-init.sh
module use /home/projects/modulefiles/local/x86-64
Expand Down Expand Up @@ -375,8 +379,6 @@ elif [ "$MACHINE" = "apollo" ]; then
ARCH_FLAG="--arch=SNB,Volta70"
fi

NUM_JOBS_TO_RUN_IN_PARALLEL=1

else
echo "Unhandled machine $MACHINE" >&2
exit 1
Expand Down Expand Up @@ -660,7 +662,7 @@ single_build_and_test() {
run_cmd ls fake_problem >& ${desc}.configure.log || { report_and_log_test_result 1 $desc configure && return 0; }
fi
else
run_cmd ${KOKKOSKERNELS_PATH}/scripts/generate_makefile.bash --with-devices=$build $ARCH_FLAG --compiler=$(which $compiler_exe) --cxxflags=\"$cxxflags\" --ldflags=\"$ldflags\" $extra_args --kokkos-path=${KOKKOS_PATH} --kokkoskernels-path=${KOKKOSKERNELS_PATH} --with-tpls=${KOKKOSKERNELS_ENABLE_TPLS} &>> ${desc}.configure.log || { report_and_log_test_result 1 ${desc} configure && return 0; }
run_cmd ${KOKKOSKERNELS_PATH}/scripts/generate_makefile.bash --with-devices=$build $ARCH_FLAG --compiler=$(which $compiler_exe) --cxxflags=\"$cxxflags\" --ldflags=\"$ldflags\" $extra_args --kokkos-path=${KOKKOS_PATH} --kokkoskernels-path=${KOKKOSKERNELS_PATH} --with-scalars=${KOKKOSKERNELS_SCALARS} --with-ordinals=${KOKKOSKERNELS_ORDINALS} --with-offsets=${KOKKOSKERNELS_OFFSETS} --with-layouts=${KOKKOSKERNELS_LAYOUTS} --with-tpls=${KOKKOSKERNELS_ENABLE_TPLS} &>> ${desc}.configure.log || { report_and_log_test_result 1 ${desc} configure && return 0; }
local -i build_start_time=$(date +%s)
run_cmd make -j 32 build-test >& ${desc}.build.log || { report_and_log_test_result 1 ${desc} build && return 0; }
local -i build_end_time=$(date +%s)
Expand Down