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

Variorium Connector: kernel granularity and JSON #265

Merged
merged 33 commits into from
Jan 17, 2025
Merged

Variorium Connector: kernel granularity and JSON #265

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
2fb4b91
first commit number 3
Jul 15, 2024
554b7f9
variorum updates
Jul 19, 2024
c4e7b0a
variorum updates
Jul 19, 2024
4e88454
clang update
Jul 22, 2024
1abd450
updated based on concerns
Aug 5, 2024
0c5d95f
Merge branch 'kokkos:develop' into varconnect
twilk10 Aug 6, 2024
e9971f8
remove build directory
Aug 6, 2024
69c8a4c
varconnect deleted
Aug 6, 2024
6c8a4c7
remove unneeded files
Aug 6, 2024
1932e24
addressing comments on pull request
Aug 7, 2024
090eda4
addressing comments on pull request
Aug 7, 2024
803f61f
Update profiling/variorum-connector/variorum-connector.cpp
twilk10 Aug 8, 2024
eebc9f4
update based on comments on pull request 10:48 8/8
Aug 8, 2024
4aefd92
updates based off of pull requests 15:37 8/8
Aug 8, 2024
56ac9cd
updates based off of pull request comments 14:04 8/9
Aug 9, 2024
7e33048
updates based off of pull request comments 14:20 8/9
Aug 9, 2024
f4a765d
Clean up the variorum connector some more
masterleinad Aug 19, 2024
357b8a2
Remove another unused variable
masterleinad Oct 14, 2024
94c8817
Replace fprintf
masterleinad Jan 16, 2025
083d345
Don;t call std:string constructor unnecessarily
masterleinad Jan 16, 2025
45c1620
Build variorum
masterleinad Jan 16, 2025
75e4bfd
Simplify
masterleinad Jan 16, 2025
281914c
Fix formatting
masterleinad Jan 16, 2025
b915c2f
Install and set Fortran compiler
masterleinad Jan 16, 2025
eff8334
Install Jansson
masterleinad Jan 16, 2025
c765e50
Simplify installation
masterleinad Jan 16, 2025
b117cf8
Variorum_ROOT -> VARIORUM_ROOT
masterleinad Jan 16, 2025
40dae3d
Don't set CMAKE_PREFIX_PATH
masterleinad Jan 17, 2025
d0807bc
Fix typo
masterleinad Jan 17, 2025
5f80c3d
Skip Variorum test
masterleinad Jan 17, 2025
e8468da
Don't use GTEST_FILTER
masterleinad Jan 17, 2025
37aab14
Improve comment
masterleinad Jan 17, 2025
d0e4f6c
Improve comment again
masterleinad Jan 17, 2025
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
15 changes: 15 additions & 0 deletions .github/workflows/build-with-kokkos.yml
View file
Open in desktop
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,6 +39,12 @@ 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
Expand Down Expand Up @@ -79,6 +86,13 @@ jobs:
libopenmpi-dev \
systemtap-sdt-dev \
libpapi-dev
- name: Compile and install Variorum
working-directory: variorum
run: |
cp ${GITHUB_WORKSPACE}/kokkos.presets.json CMakePresets.json
cmake -S src --preset=${{ matrix.preset }}
cmake --build --preset=${{ matrix.preset }}
cmake --install build-with-${{ matrix.preset }} --prefix=${Variorum_ROOT}
- name: Compile and install Kokkos
working-directory: kokkos
run: |
Expand All @@ -88,6 +102,7 @@ jobs:
cmake --install build-with-${{ matrix.preset }} --prefix=${Kokkos_ROOT}
- name: Build Kokkos Tools, enabling examples
run: |
export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH};${VARIORUM_ROOT}
Copy link
Member

Choose a reason for hiding this comment

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

I expect the environment variable already adds it to the search path

Copy link
Member

Choose a reason for hiding this comment

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

kokkos-tools/cmake/configure_variorum.cmake

Line 19 in dd08b98

find_package(Variorum QUIET)

Apparently it is spelled with an uppercase V.
Please adjust your env variable accordingly and remove the line I highlighted.

Copy link
Contributor

Choose a reason for hiding this comment

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

The previous commit had Variorum_ROOT as environemnt variable and didn't find variorum.

kokkos-tools/cmake/configure_variorum.cmake

Lines 8 to 10 in dd08b98

if(DEFINED ENV{VARIORUM_ROOT})
set(Variorum_ROOT $ENV{VARIORUM_ROOT})
set(MSG_NOTFOUND "check VARIORUM_ROOT environment variable ($ENV{VARIORUM_ROOT})")
shows that it should be all uppercase.

Copy link
Member

Choose a reason for hiding this comment

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

That configure cmake file logic is absurd and need fixing.
(On my cell can't navigate easily but in short it should not write to Variorum_ROOT that is nonsensical)

cmake -S . --preset=${{ matrix.preset }}
cmake --build --preset=${{ matrix.preset }}
cmake --install build-with-${{ matrix.preset }} --prefix=/opt/kokkos-tools
Expand Down
Loading
Loading