From 43061abf4697fdb4a7b7d1d165bdeb37cbf6ff37 Mon Sep 17 00:00:00 2001 From: Roland Haas Date: Thu, 29 Aug 2024 16:58:25 -0500 Subject: [PATCH 1/4] NewRadX: remove superfluous inheritance from CarpetX --- NewRadX/interface.ccl | 2 -- 1 file changed, 2 deletions(-) diff --git a/NewRadX/interface.ccl b/NewRadX/interface.ccl index 123c7162..dd4a5a13 100644 --- a/NewRadX/interface.ccl +++ b/NewRadX/interface.ccl @@ -2,8 +2,6 @@ IMPLEMENTS: NewRadX -INHERITS: CarpetX - USES INCLUDE HEADER: loop_device.hxx INCLUDE HEADER: newradx.hxx in newradx.hxx From a5c3ed7c3586abc1eae921beb8a56521794f243a Mon Sep 17 00:00:00 2001 From: Liwei Ji Date: Mon, 7 Oct 2024 22:26:41 -0400 Subject: [PATCH 2/4] TestNewRadX: rename CarpetX to CarpetXRegrid --- TestNewRadX/interface.ccl | 2 +- TestNewRadX/schedule.ccl | 4 ++-- scripts/spacetimex.th | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/TestNewRadX/interface.ccl b/TestNewRadX/interface.ccl index 16e338e2..46e6394f 100644 --- a/TestNewRadX/interface.ccl +++ b/TestNewRadX/interface.ccl @@ -2,7 +2,7 @@ IMPLEMENTS: TestNewRadX -INHERITS: CarpetX +INHERITS: CarpetXRegrid USES INCLUDE HEADER: loop_device.hxx USES INCLUDE HEADER: newradx.hxx diff --git a/TestNewRadX/schedule.ccl b/TestNewRadX/schedule.ccl index 0bc7a0df..931ea94c 100644 --- a/TestNewRadX/schedule.ccl +++ b/TestNewRadX/schedule.ccl @@ -13,14 +13,14 @@ SCHEDULE TestNewRadX_EstimateError AT postinitial { LANG: C READS: state(everywhere) - WRITES: CarpetX::regrid_error(interior) + WRITES: CarpetXRegrid::regrid_error(interior) } "Estimate error for regridding" SCHEDULE TestNewRadX_EstimateError AT poststep { LANG: C READS: state(everywhere) - WRITES: CarpetX::regrid_error(interior) + WRITES: CarpetXRegrid::regrid_error(interior) } "Estimate error for regridding" SCHEDULE TestNewRadX_RHS IN ODESolvers_RHS diff --git a/scripts/spacetimex.th b/scripts/spacetimex.th index 24c8d8c5..11cfe2a4 100644 --- a/scripts/spacetimex.th +++ b/scripts/spacetimex.th @@ -152,6 +152,7 @@ CarpetX/Algo CarpetX/Arith CarpetX/BoxInBox CarpetX/CarpetX +CarpetX/CarpetXRegrid CarpetX/CoordinatesX CarpetX/Derivs CarpetX/ErrorEstimator From bc634c72dfdfcf0c37a706d0e6891d0f5c160bfd Mon Sep 17 00:00:00 2001 From: Liwei Ji Date: Mon, 7 Oct 2024 22:42:13 -0400 Subject: [PATCH 3/4] scripts: rename option -DSIMD_CPU to -DSIMD_DISABLE --- scripts/actions-cuda-real64.cfg | 2 +- scripts/actions-rocm-real64.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/actions-cuda-real64.cfg b/scripts/actions-cuda-real64.cfg index f81beb5d..8f9f1bba 100644 --- a/scripts/actions-cuda-real64.cfg +++ b/scripts/actions-cuda-real64.cfg @@ -15,7 +15,7 @@ FC = gfortran F90 = gfortran LD = nvcc -CPPFLAGS = -DSIMD_CPU +CPPFLAGS = -DSIMD_DISABLE CFLAGS = -pipe -g -std=gnu11 # - We use "--relocatable-device-code=true" to allow building with # debug versions of AMReX diff --git a/scripts/actions-rocm-real64.cfg b/scripts/actions-rocm-real64.cfg index 1fe8a0ec..f067f13b 100644 --- a/scripts/actions-rocm-real64.cfg +++ b/scripts/actions-rocm-real64.cfg @@ -16,7 +16,7 @@ FC = gfortran F90 = gfortran LD = /opt/rocm/llvm/bin/clang++ -CPPFLAGS = -DSIMD_CPU +CPPFLAGS = -DSIMD_DISABLE CFLAGS = -pipe -g -std=gnu11 CXXFLAGS = -pipe -g -std=c++17 --offload-arch=gfx90a FPPFLAGS = -traditional From c4199fb78dc31210ae7c33b9a211f8c07bae5fc3 Mon Sep 17 00:00:00 2001 From: Liwei Ji Date: Mon, 7 Oct 2024 23:28:40 -0400 Subject: [PATCH 4/4] Z4c: Update to nvtx3 --- Z4c/src/adm.cxx | 2 +- Z4c/src/adm2.cxx | 2 +- Z4c/src/constraints.cxx | 2 +- Z4c/src/enforce.cxx | 2 +- Z4c/src/initial1.cxx | 2 +- Z4c/src/initial2.cxx | 2 +- Z4c/src/rhs.cxx | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Z4c/src/adm.cxx b/Z4c/src/adm.cxx index 21c2f3fe..cb5b9e45 100644 --- a/Z4c/src/adm.cxx +++ b/Z4c/src/adm.cxx @@ -10,7 +10,7 @@ #include #ifdef __CUDACC__ -#include +#include #endif #include diff --git a/Z4c/src/adm2.cxx b/Z4c/src/adm2.cxx index 3fbdc94c..af8db8fa 100644 --- a/Z4c/src/adm2.cxx +++ b/Z4c/src/adm2.cxx @@ -22,7 +22,7 @@ #include #ifdef __CUDACC__ -#include +#include #endif #include diff --git a/Z4c/src/constraints.cxx b/Z4c/src/constraints.cxx index faf32e3a..3d04625c 100644 --- a/Z4c/src/constraints.cxx +++ b/Z4c/src/constraints.cxx @@ -20,7 +20,7 @@ #include #ifdef __CUDACC__ -#include +#include #endif #include diff --git a/Z4c/src/enforce.cxx b/Z4c/src/enforce.cxx index cac7dbb0..f557bf72 100644 --- a/Z4c/src/enforce.cxx +++ b/Z4c/src/enforce.cxx @@ -10,7 +10,7 @@ #include #ifdef __CUDACC__ -#include +#include #endif #include diff --git a/Z4c/src/initial1.cxx b/Z4c/src/initial1.cxx index da9259c1..f1a28a40 100644 --- a/Z4c/src/initial1.cxx +++ b/Z4c/src/initial1.cxx @@ -9,7 +9,7 @@ #include #ifdef __CUDACC__ -#include +#include #endif #include diff --git a/Z4c/src/initial2.cxx b/Z4c/src/initial2.cxx index ec18e82a..cebb4284 100644 --- a/Z4c/src/initial2.cxx +++ b/Z4c/src/initial2.cxx @@ -8,7 +8,7 @@ #include #ifdef __CUDACC__ -#include +#include #endif namespace Z4c { diff --git a/Z4c/src/rhs.cxx b/Z4c/src/rhs.cxx index c8302786..6aaf7b47 100644 --- a/Z4c/src/rhs.cxx +++ b/Z4c/src/rhs.cxx @@ -22,7 +22,7 @@ #include #ifdef __CUDACC__ -#include +#include #endif #include