diff --git a/.gitmodules b/.gitmodules index 19c8b5b..f45415c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "tpl/raja"] path = tpl/raja url = https://github.com/LLNL/RAJA +[submodule "tpl/caliper"] + path = tpl/caliper + url = https://github.com/LLNL/Caliper.git diff --git a/containers/tutorial/Dockerfile b/containers/tutorial/Dockerfile index e640ad2..28b1b8b 100644 --- a/containers/tutorial/Dockerfile +++ b/containers/tutorial/Dockerfile @@ -21,12 +21,17 @@ RUN sudo tar xzf openvscode-server-v1.69.1-linux-x64.tar.gz && sudo chown -R ${U USER ${USER} COPY --chown=rajadev:rajadev . $HOME/tutorial/ + +RUN mkdir -p ${HOME}/tutorial/caliper_build && cd ${HOME}/tutorial/caliper_build && \ + cmake -DWITH_NVTX=ON -DWITH_CUPTI=ON -DCMAKE_INSTALL_PREFIX=$(pwd) ../tpl/caliper/ && make install -j + +ENV CALIPER_PATH ${HOME}/tutorial/caliper_build + RUN mkdir -p ${HOME}/tutorial/build && cd ${HOME}/tutorial/build && \ - cmake -DCMAKE_CXX_COMPILER=g++ -DCUDAToolkit_ROOT=/usr/local/cuda-12.3 -DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-12.3 -DCMAKE_CUDA_COMPILER=/usr/local/cuda-12.3/bin/nvcc -DENABLE_CUDA=On -DBLT_CXX_STD=c++14 -DCMAKE_CUDA_ARCHITECTURES=70 -DCMAKE_CUDA_FLAGS="--expt-extended-lambda" -DENABLE_OPENMP=On .. \ + cmake -DCMAKE_CXX_COMPILER=g++ -DCUDAToolkit_ROOT=/usr/local/cuda-12.3 -DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-12.3 -DCMAKE_CUDA_COMPILER=/usr/local/cuda-12.3/bin/nvcc -DENABLE_CUDA=On -DBLT_CXX_STD=c++14 -DCMAKE_CUDA_ARCHITECTURES=70 -DCMAKE_CUDA_FLAGS="--expt-extended-lambda" -DENABLE_OPENMP=On -DRAJA_ENABLE_CALIPER=ON -Dcaliper_DIR=$CALIPER_PATH/share/cmake/caliper .. \ && make -j RAJA \ && make -j umpire - USER root ADD ./containers/tutorial/supervisord.conf /etc/supervisord.conf RUN sed -i "s/XXX/${USER}/g" /etc/supervisord.conf diff --git a/tpl/caliper b/tpl/caliper new file mode 160000 index 0000000..691ce17 --- /dev/null +++ b/tpl/caliper @@ -0,0 +1 @@ +Subproject commit 691ce17acda8fe7daa15bca336a64fcf715122e9