diff --git a/packages/ippl/package.py b/packages/ippl/package.py index b6b2f37..8ac10fb 100644 --- a/packages/ippl/package.py +++ b/packages/ippl/package.py @@ -37,8 +37,7 @@ class Ippl(CMakePackage, CudaPackage): version("3.2.0", sha256="041a4efbddaba5b477dae01ab166354da7dee01cf625706e19f5b60c0c3f6b88") - depends_on("kokkos@4.2.00:+openmp") - depends_on("heffte@develop") + version('opalx-fielddump', branch="opalx-fielddump") variant( "build_type", @@ -62,11 +61,7 @@ class Ippl(CMakePackage, CudaPackage): depends_on("cmake@3.25.2:", type="build") depends_on("fftw@3.3.10", when="+fft") - depends_on("kokkos@4.2.00:+openmp") - depends_on("heffte@develop") - depends_on("kokkos@4.2.00:+cuda", when="+cuda") - depends_on("heffte+fftw", when="+fft") - depends_on("heffte+cuda", when="+cuda") + depends_on("mpi", when="+mpi") conflicts("~mpi", msg="IPPL can not run without mpi!") conflicts("cuda_arch=none", when="+cuda", @@ -85,20 +80,20 @@ class Ippl(CMakePackage, CudaPackage): self.define_from_variant("ENABLE_ALPINE", "alpine"), ] - if 'platform=cuda' in self.variants: + if 'platforms=cuda' in self.spec: args.append("-DIPPL_PLATFORMS=CUDA") - elif 'platform=openmp' in self.variants: + elif 'platforms=openmp' in self.spec: args.append("-DIPPL_PLATFORMS=OPENMP") - elif 'platform=openmp/cuda' in self.variants: + elif 'platforms=openmp/cuda' in self.spec: args.append("-DIPPL_PLATFORMS=OPENMP;CUDA") else: args.append("-DIPPL_PLATFORMS=SERIAL") - if 'cuda_arch=90' in self.variants: + if 'cuda_arch=90' in self.spec: args.append("-DKokkos_ARCH_HOPPER90=ON") - elif 'cuda_arch=80' in self.variants: + elif 'cuda_arch=80' in self.spec: args.append("-DKokkos_ARCH_AMPERE80=ON") - elif 'cuda_arch=60' in self.variants: + elif 'cuda_arch=60' in self.spec: args.append("-DKokkos_ARCH_PASCAL61=ON") return args