Adapt to interface changes in Fortuno

Note: currently uses a personal fork, not the official Fortuno repo.
fortuno-repos · Sep 22, 2024 · dea2bb3 · dea2bb3
1 parent 2387be0
commit dea2bb3
Show file tree

Hide file tree

Showing 14 changed files with 111 additions and 48 deletions.
diff --git a/templates/testapp-coarray.f90 b/templates/testapp-coarray.f90
@@ -1,17 +1,21 @@
-program testapp
+module test_{{cookiecutter.project_slug}}
   use {{cookiecutter.project_slug}}, only : broadcast
   use fortuno_coarray, only : as_char, test => coa_pure_case_item, context => coa_context,&
-      & execute_coa_cmd_app, is_equal, test_item
+      & is_equal, test_list
   implicit none
 
-  call execute_coa_cmd_app(&
-    testitems=[&
-      test("broadcast", test_broadcast)&
-    ]&
-  )
-
 contains
 
+  function tests()
+    type(test_list) :: tests
+
+    tests = test_list([&
+       test("broadcast", test_broadcast)&
+    ])
+
+  end function tests
+
+
   subroutine test_broadcast(ctx)
     class(context), intent(inout) :: ctx
 
@@ -33,4 +37,14 @@ subroutine test_broadcast(ctx)
 
   end subroutine test_broadcast
 
+end module test_{{cookiecutter.project_slug}}
+
+
+program testapp
+  use fortuno_coarray, only : execute_coa_cmd_app
+  use test_{{cookiecutter.project_slug}}, only : tests
+  implicit none
+
+  call execute_coa_cmd_app(tests())
+
 end program testapp
diff --git a/templates/testapp-mpi.f90 b/templates/testapp-mpi.f90
@@ -1,20 +1,24 @@
-program testapp
+module test_{{cookiecutter.project_slug}}
   use {{cookiecutter.project_slug}}, only : broadcast
-  use fortuno_mpi, only : execute_mpi_cmd_app, global_comm, is_equal, test => mpi_case_item,&
-      & check => mpi_check, test_item, this_rank
+  use fortuno_mpi, only : global_comm, is_equal, test => mpi_case_item, check => mpi_check,&
+      & test_list, this_rank
   implicit none
 
-  call execute_mpi_cmd_app(&
-      testitems=[&
-          test("broadcast", test_broadcast)&
-      ]&
-  )
-
 contains
 
+  function tests()
+    type(test_list) :: tests
+
+    tests = test_list([&
+        test("broadcast", test_broadcast)&
+    &])
+
+  end function tests
+
+
   subroutine test_broadcast()
-     integer, parameter :: sourcerank = 0, sourceval = 1, otherval = -1
-     integer :: buffer
+    integer, parameter :: sourcerank = 0, sourceval = 1, otherval = -1
+    integer :: buffer
 
     ! GIVEN source rank contains a different integer value as all other ranks
     if (this_rank() == sourcerank) then
@@ -31,4 +35,14 @@ subroutine test_broadcast()
 
   end subroutine test_broadcast
 
+end module test_{{cookiecutter.project_slug}}
+
+
+program testapp
+  use fortuno_mpi, only : execute_mpi_cmd_app
+  use test_{{cookiecutter.project_slug}}, only : tests
+  implicit none
+
+  call execute_mpi_cmd_app(tests())
+
 end program testapp
diff --git a/templates/testapp-serial.f90 b/templates/testapp-serial.f90
@@ -1,19 +1,21 @@
-program testapp
+module test_{{cookiecutter.project_slug}}
   use {{cookiecutter.project_slug}}, only : factorial
-  use fortuno_serial, only : execute_serial_cmd_app, is_equal, test => serial_case_item,&
-      & check => serial_check
+  use fortuno_serial, only : is_equal, test => serial_case_item, check => serial_check, test_list
   implicit none
 
-  call execute_serial_cmd_app(&
-      testitems=[&
-          test("factorial_0", test_factorial_0),&
-          test("factorial_1", test_factorial_1),&
-          test("factorial_2", test_factorial_2)&
-      ]&
-  )
-
 contains
 
+  function tests()
+    type(test_list) :: tests
+
+    tests = test_list([&
+      test("factorial_0", test_factorial_0),&
+      test("factorial_1", test_factorial_1),&
+      test("factorial_2", test_factorial_2)&
+    ])
+
+  end function tests
+
   ! Test: 0! = 1
   subroutine test_factorial_0()
     call check(factorial(0) == 1)
@@ -30,4 +32,14 @@ subroutine test_factorial_2()
     call check(is_equal(factorial(2), 2))
   end subroutine test_factorial_2
 
+end module test_{{cookiecutter.project_slug}}
+
+
+program testapp
+  use fortuno_serial, only : execute_serial_cmd_app
+  use test_{{cookiecutter.project_slug}}, only : tests
+  implicit none
+
+  call execute_serial_cmd_app(tests())
+
 end program testapp
diff --git a/test/runners/init.sh b/test/runners/init.sh
@@ -1,5 +1,7 @@
 TEST_DIR="$(readlink -f $SCRIPT_DIR/..)"
 COOKIECUTTER_ROOT_DIR="$(readlink -f $SCRIPT_DIR/../..)"
+DISTRO_ID=$(python3 -c "import platform; print(platform.freedesktop_os_release()['ID'])")
+LIB_DIR=$([[ "${DISTRO_ID}" =~ ^(ubuntu|debian)$ ]] && echo "lib" || echo "lib64")
 
 build_dir=$1
 if [[ -z ${build_dir} ]]; then

diff --git a/test/runners/test.cmake-coarray.sh b/test/runners/test.cmake-coarray.sh
@@ -33,7 +33,7 @@ CMAKE_PREFIX_PATH=$PWD/_install\
 cmake --build _build_export_cmake
 ./_build_export_cmake/app/export_test
 
-PKG_CONFIG_PATH=$PWD/_install/lib/pkgconfig\
+PKG_CONFIG_PATH=$PWD/_install/${LIB_DIR}/pkgconfig\
   cmake\
   -B _build_export_pkgconf\
   -GNinja\

diff --git a/test/runners/test.cmake-mpi.sh b/test/runners/test.cmake-mpi.sh
@@ -29,7 +29,7 @@ CMAKE_PREFIX_PATH=$PWD/_install\
 cmake --build _build_export_cmake
 mpirun -n 2 ./_build_export_cmake/app/export_test
 
-PKG_CONFIG_PATH=$PWD/_install/lib/pkgconfig\
+PKG_CONFIG_PATH=$PWD/_install/${LIB_DIR}/pkgconfig\
   cmake\
   -B _build_export_pkgconf\
   -GNinja\

diff --git a/test/runners/test.cmake-serial.sh b/test/runners/test.cmake-serial.sh
@@ -2,6 +2,12 @@
 set -e -v -x
 
 SCRIPT_DIR="$(readlink -f $(dirname ${BASH_SOURCE[0]}))"
+DISTRO_ID=$(python3 -c "import platform; print(platform.freedesktop_os_release()['ID'])")
+if [[ "${DISTRO_ID}" =~ ^(ubuntu|debian)$ ]]; then
+  LIB_DIR="lib"
+else
+  LIB_DIR="lib64"
+fi
 
 source ${SCRIPT_DIR}/init.sh
 
@@ -29,7 +35,7 @@ CMAKE_PREFIX_PATH=$PWD/_install\
 cmake --build _build_export_cmake
 ./_build_export_cmake/app/export_test
 
-PKG_CONFIG_PATH=$PWD/_install/lib/pkgconfig\
+PKG_CONFIG_PATH=$PWD/_install/${LIB_DIR}/pkgconfig\
   cmake\
   -B _build_export_pkgconf\
   -GNinja\

diff --git a/{{ cookiecutter.project_slug }}/fpm.toml b/{{ cookiecutter.project_slug }}/fpm.toml
@@ -37,9 +37,12 @@ mpi = "*"
 
 [dev-dependencies]
 {% if cookiecutter.__serial_code == "True" -%}
-fortuno = { git = "https://github.com/fortuno-repos/fortuno.git" }
+# fortuno = { git = "https://github.com/fortuno-repos/fortuno.git" }
+fortuno = { git = "https://github.com/aradi/fortuno.git", branch = "testlist" }
 {%- elif cookiecutter.__mpi_code == "True" -%}
-fortuno-mpi = { git = "https://github.com/fortuno-repos/fortuno-mpi.git" }
+# fortuno-mpi = { git = "https://github.com/fortuno-repos/fortuno-mpi.git" }
+fortuno-mpi = { git = "https://github.com/aradi/fortuno-mpi.git", branch = "testlist" }
 {%- elif cookiecutter.__coarray_code == "True" -%}
-fortuno-coarray = { git = "https://github.com/fortuno-repos/fortuno-coarray.git" }
+# fortuno-coarray = { git = "https://github.com/fortuno-repos/fortuno-coarray.git" }
+fortuno-coarray = { git = "https://github.com/aradi/fortuno-coarray.git", branch = "testlist" }
 {%- endif %}
diff --git a/{{ cookiecutter.project_slug }}/subprojects/Fortuno.cmake b/{{ cookiecutter.project_slug }}/subprojects/Fortuno.cmake
@@ -11,8 +11,10 @@ option(
 # Make subproject available
 FetchContent_Declare(
   Fortuno
-  GIT_REPOSITORY "https://github.com/fortuno-repos/fortuno.git"
-  GIT_TAG "main"
+  # GIT_REPOSITORY "https://github.com/fortuno-repos/fortuno.git"
+  # GIT_TAG "main"
+  GIT_REPOSITORY "https://github.com/aradi/fortuno.git"
+  GIT_TAG "testlist"
   FIND_PACKAGE_ARGS
 )
 FetchContent_MakeAvailable(Fortuno)

diff --git a/{{ cookiecutter.project_slug }}/subprojects/FortunoCoarray.cmake b/{{ cookiecutter.project_slug }}/subprojects/FortunoCoarray.cmake
@@ -11,8 +11,10 @@ option(
 # Make subproject available
 FetchContent_Declare(
   FortunoCoarray
-  GIT_REPOSITORY "https://github.com/fortuno-repos/fortuno-coarray.git"
-  GIT_TAG "main"
+  # GIT_REPOSITORY "https://github.com/fortuno-repos/fortuno-coarray.git"
+  # GIT_TAG "main"
+  GIT_REPOSITORY "https://github.com/aradi/fortuno-coarray.git"
+  GIT_TAG "testlist"
   FIND_PACKAGE_ARGS
 )
 FetchContent_MakeAvailable(FortunoCoarray)

diff --git a/{{ cookiecutter.project_slug }}/subprojects/FortunoMpi.cmake b/{{ cookiecutter.project_slug }}/subprojects/FortunoMpi.cmake
@@ -11,8 +11,10 @@ option(
 # Make subproject available
 FetchContent_Declare(
   FortunoMpi
-  GIT_REPOSITORY "https://github.com/fortuno-repos/fortuno-mpi.git"
-  GIT_TAG "main"
+  # GIT_REPOSITORY "https://github.com/fortuno-repos/fortuno-mpi.git"
+  # GIT_TAG "main"
+  GIT_REPOSITORY "https://github.com/aradi/fortuno-mpi.git"
+  GIT_TAG "testlist"
   FIND_PACKAGE_ARGS
 )
 FetchContent_MakeAvailable(FortunoMpi)

diff --git a/{{ cookiecutter.project_slug }}/subprojects/fortuno-coarray.wrap b/{{ cookiecutter.project_slug }}/subprojects/fortuno-coarray.wrap
@@ -1,4 +1,6 @@
 [wrap-git]
 directory=fortuno-coarray
-url=https://github.com/fortuno-repos/fortuno-coarray
-revision=main
+# url=https://github.com/fortuno-repos/fortuno-coarray
+# revision=main
+url=https://github.com/aradi/fortuno-coarray
+revision=testlist
diff --git a/{{ cookiecutter.project_slug }}/subprojects/fortuno-mpi.wrap b/{{ cookiecutter.project_slug }}/subprojects/fortuno-mpi.wrap
@@ -1,4 +1,6 @@
 [wrap-git]
 directory=fortuno-mpi
-url=https://github.com/fortuno-repos/fortuno-mpi
-revision=main
+# url=https://github.com/fortuno-repos/fortuno-mpi
+# revision=main
+url=https://github.com/aradi/fortuno-mpi
+revision=testlist
diff --git a/{{ cookiecutter.project_slug }}/subprojects/fortuno.wrap b/{{ cookiecutter.project_slug }}/subprojects/fortuno.wrap
@@ -1,4 +1,6 @@
 [wrap-git]
 directory=fortuno
-url=https://github.com/fortuno-repos/fortuno
-revision=main
+# url=https://github.com/fortuno-repos/fortuno
+# revision=main
+url=https://github.com/aradi/fortuno
+revision=testlist