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.

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

Require Kokkos 4.1 #973

Merged
merged 8 commits into from
Dec 19, 2023
Merged

Require Kokkos 4.1 #973

merged 8 commits into from
Dec 19, 2023

Conversation

aprokop
Copy link
Contributor

@aprokop aprokop commented Nov 22, 2023

No description provided.

@aprokop aprokop added the build Build and installation label Nov 22, 2023
@@ -89,7 +89,7 @@ RUN SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
rm -rf ${SCRATCH_DIR}

# Install Kokkos
ARG KOKKOS_VERSION=4.0.00
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why not bump 4.0.00 to 4.1.00 and 4.1.00 to 4.2.00?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thought we would leap frog the versions. Change 4.0 to 4.2 now, change 4.1 to 4.3 next time. This way we have a mix of older builds and newer builds.

Copy link
Collaborator

Choose a reason for hiding this comment

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

For SYCL in particular I would prefer using the most recent release. Otherwise, I don't have a strong opinion.

@@ -32,6 +31,7 @@
#include <ArborX_TraversalPolicy.hpp>

#include <Kokkos_Core.hpp>
#include <Kokkos_Profiling_ScopedRegion.hpp>
Copy link
Contributor

Choose a reason for hiding this comment

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

I just realized it is not provided by <Kokkos_Core.hpp> :(

Comment on lines 16 to 17
#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
#include <ArborX_DetailsKokkosExtMinMaxOperations.hpp>
Copy link
Contributor

Choose a reason for hiding this comment

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

What is the deal with these? Oversight?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, probably happened during a rebase.

@@ -22,6 +23,9 @@
#include <ArborX_DetailsWeightedEdge.hpp>
#include <ArborX_LinearBVH.hpp>

#include <Kokkos_Core.hpp>
Copy link
Contributor

Choose a reason for hiding this comment

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

OK

@@ -3,7 +3,7 @@ in the environment file. Its value will be prepended along with the service
name to the container on start up.


You may use multiple compose files to customize your container. For instance, you
You may use multiple compose files to customize your container. For instance, you
Copy link
Contributor

Choose a reason for hiding this comment

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

Why did you change? This is likely me using two spaces between sentences.
In any case, not really related to this PR. I am not requesting changes but if there is any further push I would like you to undo.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I changed it in a9dba00, before your review, when I needed to force push to fix the incorrect Jenkins links, and was looking for a minor change.

@aprokop aprokop merged commit fd157d7 into arborx:master Dec 19, 2023
1 check passed
@aprokop aprokop deleted the require_kokkos_4.1 branch December 19, 2023 00:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Build and installation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants