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

Paraview hip variant #33653

Closed
wants to merge 1 commit into from
Closed

Conversation

mathstuf
Copy link
Contributor

@mathstuf mathstuf commented Nov 1, 2022

No description provided.

@mathstuf mathstuf force-pushed the paraview-hip-variant branch 2 times, most recently from 032130b to ef6b6cc Compare November 2, 2022 17:30
@mathstuf mathstuf force-pushed the paraview-hip-variant branch 3 times, most recently from 363b7ff to f741eb7 Compare November 10, 2022 23:46
@mathstuf mathstuf marked this pull request as ready for review November 10, 2022 23:46
@mathstuf
Copy link
Contributor Author

I've tested this on crusher (I used a different way to get Kokkos_CXX_COMPILER, but am testing this diff…if spack would actually get to the build bit).

@vicentebolea
Copy link
Member

I've tested this on crusher (I used a different way to get Kokkos_CXX_COMPILER, but am testing this diff…if spack would actually get to the build bit).

Thanks! I will try to replicate this in other HIP enable machines

Copy link
Member

@vicentebolea vicentebolea left a comment

Choose a reason for hiding this comment

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

We need to enable use_vtkm when +rocm

@kwryankrattiger
Copy link
Contributor

We need to enable use_vtkm when +rocm

Really, it needs to conflict with use_vtkm=off since default and on should both be about to handle this correctly.

@mathstuf
Copy link
Contributor Author

Now conflicts with no-vtkm.

@vicentebolea
Copy link
Member

@mathstuf

I was able to build this PR with the following changes:

diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py
index 0a2195260d..852960fcd7 100644
--- a/var/spack/repos/builtin/packages/paraview/package.py
+++ b/var/spack/repos/builtin/packages/paraview/package.py
@@ -204,7 +204,7 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
     depends_on("llvm-amdgpu", when="+rocm")
     for target in ROCmPackage.amdgpu_targets:
         depends_on(
-            "kokkos amdgpu_target={0}".format(target),
+            "kokkos +rocm amdgpu_target={0}".format(target),
             when="+rocm amdgpu_target={0}".format(target),
         )
 
@@ -591,7 +591,7 @@ def nvariant_bool(feature):
             if "+rocm" in spec:
                 cmake_args.append(
                     "-DKokkos_CXX_COMPILER=%s"
-                    % join_path(spec["llvm-amdgpu"].prefix.bin, "clang++")
+                    % join_path(spec["hip"].prefix.bin, "amdclang++")
                 )
 
         if "+catalyst" in spec:

I also had to rebase to the latest "Develop" as in the current stage certain dependencies would not build.

@mathstuf mathstuf force-pushed the paraview-hip-variant branch 2 times, most recently from 89538ad to 226029a Compare November 26, 2022 16:44
This conflicts with CUDA and requires at least ParaView 5.11.0-RC2. More
dependencies are also needed.
@kwryankrattiger kwryankrattiger mentioned this pull request Jan 4, 2023
@kwryankrattiger
Copy link
Contributor

This feature is now merged in #34790

@mathstuf mathstuf deleted the paraview-hip-variant branch April 11, 2023 02:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants