Skip to content

Commit

Permalink
Variorium Connector: kernel granularity and JSON (#265)
Browse files Browse the repository at this point in the history
* first commit number 3

* variorum updates

* variorum updates

* clang update

* updated based on concerns

* remove build directory

* varconnect deleted

* remove unneeded files

* addressing comments on pull request

* addressing comments on pull request

* Update profiling/variorum-connector/variorum-connector.cpp

Co-authored-by: Daniel Arndt <[email protected]>

* update based on comments on pull request 10:48 8/8

* updates based off of pull requests 15:37 8/8

* updates based off of pull request comments 14:04 8/9

* updates based off of pull request comments 14:20 8/9

* Clean up the variorum connector some more

* Remove another unused variable

* Replace fprintf

* Don;t call std:string constructor unnecessarily

* Build variorum

* Simplify

* Fix formatting

* Install and set Fortran compiler

* Install Jansson

* Simplify installation

* Variorum_ROOT -> VARIORUM_ROOT

* Don't set CMAKE_PREFIX_PATH

* Fix typo

* Skip Variorum test

* Don't use GTEST_FILTER

* Improve comment

* Improve comment again

---------

Co-authored-by: Tyler Wilkerson (kuw) <[email protected]>
Co-authored-by: Daniel Arndt <[email protected]>
  • Loading branch information
3 people authored Jan 17, 2025
1 parent dd08b98 commit 2f784b3
Show file tree
Hide file tree
Showing 2 changed files with 181 additions and 372 deletions.
25 changes: 21 additions & 4 deletions .github/workflows/build-with-kokkos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
image: ${{ matrix.image }}
env:
Kokkos_ROOT: /opt/kokkos
VARIORUM_ROOT: /opt/variorum
steps:
- name: Checkout Kokkos Tools
uses: actions/checkout@v4
Expand All @@ -38,22 +39,29 @@ jobs:
repository: kokkos/kokkos
path: kokkos
ref: develop
- name: Checkout Varioum
uses: actions/checkout@v4
with:
repository: LLNL/variorum
path: variorum
ref: 249a39bf41972afe2213d3dc904e47647364f466
- name: Install compilers
run : |
apt update
if [ ${{ matrix.compiler }} != 'default' ];then
apt --yes --no-install-recommends install ${{ matrix.compiler.c }} ${{ matrix.compiler.cpp }}
apt --yes --no-install-recommends install ${{ matrix.compiler.c }} ${{ matrix.compiler.cpp }} gfortran
export CC=${{ matrix.compiler.c }}
export CXX=${{ matrix.compiler.cpp }}
else
apt --yes --no-install-recommends install gcc g++
apt --yes --no-install-recommends install gcc g++ gfortran
export CC=gcc
export CXX=g++
fi
echo "CC=$CC" >> $GITHUB_ENV
echo "CXX=$CXX" >> $GITHUB_ENV
echo "FC=gfortran" >> $GITHUB_ENV
case ${{ matrix.preset }} in
*OpenMP* )
Expand All @@ -71,14 +79,22 @@ jobs:
exit -1
esac
- name: Install git, CMake, OpenMPI, PAPI and dtrace
- name: Install git, CMake, Jansson, OpenMPI, PAPI and dtrace
run: |
apt --yes --no-install-recommends install \
git ca-certificates \
cmake make \
libopenmpi-dev \
systemtap-sdt-dev \
libjansson-dev \
libpapi-dev
- name: Compile and install Variorum
working-directory: variorum
run: |
cp ${GITHUB_WORKSPACE}/kokkos.presets.json CMakePresets.json
cmake -S src -B build -DCMAKE_INSTALL_PREFIX=${VARIORUM_ROOT}
cd build
make install
- name: Compile and install Kokkos
working-directory: kokkos
run: |
Expand All @@ -92,7 +108,8 @@ jobs:
cmake --build --preset=${{ matrix.preset }}
cmake --install build-with-${{ matrix.preset }} --prefix=/opt/kokkos-tools
# For now, GitHub runners are used. These runner don't have GPUs. Therefore, testing can only be done for OpenMP.
# Skip variorum test since the architecture detected by variorum is not supported
- name: Run tests
if: ${{ matrix.preset == 'OpenMP' }}
run: |
ctest --preset=${{ matrix.preset }}
ctest -E "test_kokkos_tools_variorum" --preset=${{ matrix.preset }}
Loading

0 comments on commit 2f784b3

Please sign in to comment.