From dd5a8c027daf0a82c697e5a944ce06d75abcc614 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Mon, 28 Aug 2023 15:23:58 -0600 Subject: [PATCH 1/6] Use sundials submodule for make TPL. --- Exec/Make.PeleC | 19 ++++++++----------- Submodules/PelePhysics | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Exec/Make.PeleC b/Exec/Make.PeleC index 2dd003bf7..46dabf04e 100644 --- a/Exec/Make.PeleC +++ b/Exec/Make.PeleC @@ -1,11 +1,8 @@ PELEC_HOME ?= ../ -PELE_PHYSICS_HOME ?= $(PELEC_HOME)/Submodules/PelePhysics -AMREX_HOME ?= $(PELEC_HOME)/Submodules/AMReX -AMREX_HYDRO_HOME ?= $(PELEC_HOME)/Submodules/AMReX-Hydro -SUNDIALS_HOME ?= $(PELEC_HOME)/Submodules/sundials -PELEMP_HOME ?= $(PELEC_HOME)/Submodules/PeleMP - -TOP ?= $(PELEC_HOME) +PELE_PHYSICS_HOME ?= $(abspath $(lastword $(PELEC_HOME)/Submodules/PelePhysics)) +AMREX_HOME ?= $(abspath $(lastword $(PELEC_HOME)/Submodules/AMReX)) +SUNDIALS_HOME ?= $(abspath $(lastword $(PELEC_HOME)/Submodules/sundials)) +PELEMP_HOME ?= $(abspath $(lastword $(PELEC_HOME)/Submodules/PeleMP)) EBASE = PeleC @@ -164,7 +161,7 @@ AMReX_buildInfo.cpp: --COMP "$(COMP)" --COMP_VERSION "$(COMP_VERSION)" \ --FCOMP "$(FCOMP)" --FCOMP_VERSION "$(FCOMP_VERSION)" \ --MODULES "$(MNAMES)" \ - --GIT "$(TOP) $(AMREX_HOME) $(PELE_PHYSICS_HOME) $(AMREX_HYDRO_HOME) $(SUNDIALS_HOME)" + --GIT "$(PELEC_HOME) $(AMREX_HOME) $(PELE_PHYSICS_HOME) $(SUNDIALS_HOME) $(PELEMP_HOME)" include $(AMREX_HOME)/Tools/GNUMake/Make.rules @@ -173,15 +170,15 @@ clean:: TPL: @echo "==> Building SUNDIALS library" - cd $(PELE_PHYSICS_HOME)/ThirdParty; $(MAKE) sundials AMREX_HOME=$(AMREX_HOME) USE_CUDA=$(USE_CUDA) USE_HIP=$(USE_HIP) USE_SYCL=$(USE_SYCL) PELE_USE_KLU=$(PELE_USE_KLU) PELE_USE_MAGMA=$(PELE_USE_MAGMA) DEBUG=$(DEBUG) COMP=$(COMP) NVCC=$(COMP) PRECISION=$(PRECISION) + cd $(PELE_PHYSICS_HOME)/ThirdParty; $(MAKE) sundials SUNDIALS_HOME=$(SUNDIALS_HOME) AMREX_HOME=$(AMREX_HOME) USE_CUDA=$(USE_CUDA) USE_HIP=$(USE_HIP) USE_SYCL=$(USE_SYCL) PELE_USE_KLU=$(PELE_USE_KLU) PELE_USE_MAGMA=$(PELE_USE_MAGMA) DEBUG=$(DEBUG) COMP=$(COMP) NVCC=$(COMP) PRECISION=$(PRECISION) TPLclean: @echo "==> Removing SUNDIALS library" - cd $(PELE_PHYSICS_HOME)/ThirdParty; make AMREX_HOME=$(AMREX_HOME) USE_CUDA=$(USE_CUDA) USE_HIP=$(USE_HIP) USE_SYCL=$(USE_SYCL) PELE_USE_KLU=$(PELE_USE_KLU) PELE_USE_MAGMA=$(PELE_USE_MAGMA) DEBUG=$(DEBUG) COMP=$(HOSTCC) NVCC=$(COMP) PRECISION=$(PRECISION) clean + cd $(PELE_PHYSICS_HOME)/ThirdParty; make SUNDIALS_HOME=$(SUNDIALS_HOME) AMREX_HOME=$(AMREX_HOME) USE_CUDA=$(USE_CUDA) USE_HIP=$(USE_HIP) USE_SYCL=$(USE_SYCL) PELE_USE_KLU=$(PELE_USE_KLU) PELE_USE_MAGMA=$(PELE_USE_MAGMA) DEBUG=$(DEBUG) COMP=$(HOSTCC) NVCC=$(COMP) PRECISION=$(PRECISION) clean TPLrealclean: @echo "==> Removing SUNDIALS library" - cd $(PELE_PHYSICS_HOME)/ThirdParty; make AMREX_HOME=$(AMREX_HOME) USE_CUDA=$(USE_CUDA) USE_HIP=$(USE_HIP) USE_SYCL=$(USE_SYCL) PELE_USE_KLU=$(PELE_USE_KLU) PELE_USE_MAGMA=$(PELE_USE_MAGMA) DEBUG=$(DEBUG) COMP=$(HOSTCC) NVCC=$(COMP) PRECISION=$(PRECISION) realclean + cd $(PELE_PHYSICS_HOME)/ThirdParty; make SUNDIALS_HOME=$(SUNDIALS_HOME) AMREX_HOME=$(AMREX_HOME) USE_CUDA=$(USE_CUDA) USE_HIP=$(USE_HIP) USE_SYCL=$(USE_SYCL) PELE_USE_KLU=$(PELE_USE_KLU) PELE_USE_MAGMA=$(PELE_USE_MAGMA) DEBUG=$(DEBUG) COMP=$(HOSTCC) NVCC=$(COMP) PRECISION=$(PRECISION) realclean #----------------------------------------------------------------------------- # for debugging. To see the value of a Makefile variable, diff --git a/Submodules/PelePhysics b/Submodules/PelePhysics index a3db30886..70e947d9b 160000 --- a/Submodules/PelePhysics +++ b/Submodules/PelePhysics @@ -1 +1 @@ -Subproject commit a3db30886996a01e0c5d2999d70d62a742d59c8a +Subproject commit 70e947d9b8d564c71a2ec8a02128fcf5c1e358c2 From 1019b67142635a4d17c9b18b818043c1b2f2233d Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Mon, 28 Aug 2023 15:25:53 -0600 Subject: [PATCH 2/6] Update PelePhysics. --- Submodules/PelePhysics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Submodules/PelePhysics b/Submodules/PelePhysics index 70e947d9b..06ee332ba 160000 --- a/Submodules/PelePhysics +++ b/Submodules/PelePhysics @@ -1 +1 @@ -Subproject commit 70e947d9b8d564c71a2ec8a02128fcf5c1e358c2 +Subproject commit 06ee332ba0b55480bfc60409a145fea1fd43194d From d1f60daada115d2771a2cad3af844725a7a76dac Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Mon, 28 Aug 2023 16:36:43 -0600 Subject: [PATCH 3/6] Update PelePhysics. --- Submodules/PelePhysics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Submodules/PelePhysics b/Submodules/PelePhysics index 06ee332ba..ccf250415 160000 --- a/Submodules/PelePhysics +++ b/Submodules/PelePhysics @@ -1 +1 @@ -Subproject commit 06ee332ba0b55480bfc60409a145fea1fd43194d +Subproject commit ccf250415dc2a239c14db07c539752e32f32e2dc From 7a820366d565f2fd260976fa769627b20999d5a5 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Mon, 28 Aug 2023 19:45:42 -0600 Subject: [PATCH 4/6] Update PelePhysics. --- Submodules/PelePhysics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Submodules/PelePhysics b/Submodules/PelePhysics index ccf250415..f50f4fa30 160000 --- a/Submodules/PelePhysics +++ b/Submodules/PelePhysics @@ -1 +1 @@ -Subproject commit ccf250415dc2a239c14db07c539752e32f32e2dc +Subproject commit f50f4fa3007926da697d2c3b00dc0f7d6dfdfb57 From 1d3dafaf3bf05de8555512748de4a37a0a35bba9 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Mon, 28 Aug 2023 19:50:49 -0600 Subject: [PATCH 5/6] Update PelePhysics. --- Submodules/PelePhysics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Submodules/PelePhysics b/Submodules/PelePhysics index f50f4fa30..d5ec293fd 160000 --- a/Submodules/PelePhysics +++ b/Submodules/PelePhysics @@ -1 +1 @@ -Subproject commit f50f4fa3007926da697d2c3b00dc0f7d6dfdfb57 +Subproject commit d5ec293fd5d73523bcacb121e95b35152397b0bb From 1686c4ad4724f3d61ee69283ea532ab400aec36b Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Tue, 29 Aug 2023 09:33:04 -0600 Subject: [PATCH 6/6] Update PelePhysics. --- Submodules/PelePhysics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Submodules/PelePhysics b/Submodules/PelePhysics index d5ec293fd..b6aa68998 160000 --- a/Submodules/PelePhysics +++ b/Submodules/PelePhysics @@ -1 +1 @@ -Subproject commit d5ec293fd5d73523bcacb121e95b35152397b0bb +Subproject commit b6aa6899850154142bbd8dd9c7485c645ce17d05