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

Update summit build #14

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
+15 −16
Open

Update summit build #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d2ef828
Get kookos working on summit
diehlpk Feb 11, 2021
cb0eda1
Merge branch 'add_cppuddle' into update_summit_build
G-071 Feb 18, 2021
fcf7b61
Add otf2 traces
diehlpk Apr 22, 2021
cbc021a
Update the silo url
diehlpk Sep 13, 2021
1910e25
Fix silo.sh
diehlpk Nov 10, 2021
18044bc
Merge branch 'main' into update_summit_build
diehlpk Jan 18, 2022
bf77c34
Merge branch 'main' into update_summit_build
diehlpk Jan 27, 2022
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
2 changes: 0 additions & 2 deletions build-hpx-kokkos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ if [[ ! -d ${DIR_SRC} ]]; then
cd ..
git clone https://github.com/STEllAR-GROUP/hpx-kokkos.git hpx-kokkos
cd hpx-kokkos
#git checkout ce63b0630c739a4df899749ed67baa867862f3fc
git checkout ${HPX_KOKKOS_VERSION}
cd ..
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why should we remove this but not the opening parenthesis?

fi

mkdir -p "$DIR_BUILD"
Expand Down
1 change: 0 additions & 1 deletion build-hpx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ if [[ ! -d ${DIR_SRC} ]]; then
cd hpx
git checkout ${HPX_VERSION}
cd ..
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why should we remove this but not the opening parenthesis?

fi

${CMAKE_COMMAND} \
Expand Down
15 changes: 8 additions & 7 deletions build-octotiger.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@ set -ex
${OCT_WITH_KOKKOS_SCALAR:?} ${CUDA_SM:?} ${OCT_ARCH_FLAGS:?}


DIR_SRC=${SOURCE_ROOT}/octotiger
DIR_BUILD=${INSTALL_ROOT}/octotiger/build
DIR_SRC=${SOURCE_ROOT}/octotiger-kokkos
DIR_BUILD=${INSTALL_ROOT}/octotiger/build-kokkos
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't particularly like this change (breaks some of my scripts and my own muscle memory :-) )

Is there a specific reason for it?

#DIR_INSTALL=${INSTALL_ROOT}/octotiger

if [[ ! -d ${DIR_SRC} ]]; then
git clone https://github.com/STEllAR-GROUP/octotiger.git ${DIR_SRC}
pushd ${DIR_SRC}
git checkout master
git submodule update --init --recursive
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why stop checking out the testdata? This would require us to adapt all Jenkins CI pipelines to add this as an additional step (in addition to do this manually for all of our other builds).

popd
fi

Expand All @@ -34,8 +33,8 @@ ${CMAKE_COMMAND} \
-DOCTOTIGER_WITH_CUDA=$OCT_WITH_CUDA \
-DOCTOTIGER_WITH_KOKKOS=$OCT_WITH_KOKKOS \
-DOCTOTIGER_WITH_BLAST_TEST=ON \
-DOCTOTIGER_WITH_TESTS=ON \
-DOCTOTIGER_WITH_Vc=ON \
-DOCTOTIGER_WITH_TESTS=OFF \
-DOCTOTIGER_WITH_Vc=OFF \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would keep these on ON as we don't gain anything by turning it OFF yet (as some old methods still pull in Vc)

-DOCTOTIGER_WITH_LEGACY_VC=OFF \
-DOCTOTIGER_WITH_GRIDDIM=8 \
-DOCTOTIGER_WITH_MAX_NUMBER_FIELDS=15 \
Expand All @@ -45,7 +44,7 @@ ${CMAKE_COMMAND} \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-DVc_DIR=$INSTALL_ROOT/Vc/lib/cmake/Vc \
-DBOOST_ROOT=$BOOST_ROOT \
-DHPX_DIR=$INSTALL_ROOT/hpx/$LIBHPX/cmake/HPX/ \
-DHPX_DIR=$INSTALL_ROOT/hpx/$LIBHPX64/cmake/HPX/ \
-DHDF5_INCLUDE_DIR=$INSTALL_ROOT/hdf5/include \
-DSilo_INCLUDE_DIR=$INSTALL_ROOT/silo/include \
-DSilo_LIBRARY=$INSTALL_ROOT/silo/lib/libsiloh5.a \
Expand All @@ -55,7 +54,9 @@ ${CMAKE_COMMAND} \
-DOCTOTIGER_ARCH_FLAG=${OCT_ARCH_FLAGS} \
-DCPPuddle_DIR=$INSTALL_ROOT/cppuddle/build/cppuddle/lib/cmake/CPPuddle \
-DKokkos_DIR=$INSTALL_ROOT/kokkos/install/${LIB_DIR_NAME}/cmake/Kokkos \
-DHPXKokkos_DIR=$INSTALL_ROOT/hpx-kokkos/install/${LIB_DIR_NAME}/cmake/HPXKokkos
-DHPXKokkos_DIR=$INSTALL_ROOT/hpx-kokkos/install/${LIB_DIR_NAME}/cmake/HPXKokkos \
-DCMAKE_CXX_COMPILER="${OCT_CMAKE_CXX_COMPILER}" \
-DOCTOTIGER_WITH_GRIDDIM=16
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like an error


${CMAKE_COMMAND} --build ${DIR_BUILD} -- -j${PARALLEL_BUILD} VERBOSE=1

Expand Down
11 changes: 6 additions & 5 deletions build-silo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ if [[ ! -d ${DIR_SRC} ]]; then
(
mkdir -p ${DIR_SRC}
cd ${DIR_SRC}
wget ${DOWNLOAD_URL}
tar -xf silo-${SILO_VERSION}-bsd.tgz
mv silo-${SILO_VERSION}-bsd/* .
rm -rf silo-${SILO_VERSION}-bsd
)

wget ${DOWNLOAD_URL}
tar -xf silo-${SILO_VERSION}-bsd.tgz
mv silo-${SILO_VERSION}-bsd/* .
rm -rf silo-${SILO_VERSION}-bsd

fi

(
Expand Down
2 changes: 1 addition & 1 deletion config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export SOURCE_ROOT=${POWERTIGER_ROOT}/src
# CMake
export CMAKE_VERSION=3.19.5


# GCC
export GCC_VERSION=9.3.0

Expand Down Expand Up @@ -62,7 +63,6 @@ export KOKKOS_CONFIG=" -DKokkos_ARCH_HSW=ON -DKokkos_ARCH_AMPERE80=ON "
#export KOKKOS_CONFIG=" -DKokkos_ARCH_SKX=ON -DKokkos_ARCH_MAXWELL50=ON "
#export KOKKOS_CONFIG=" -DKokkos_ARCH_HSW=ON -DKokkos_ARCH_AMPERE80=ON "


#Libfabric
export LIBFABRIC_VERSION=1.9.0

Expand Down