Add amuse-ph4-sapporo2 package

Author: LourensVeen

src/amuse_ph4/Makefile

@@ -22,7 +22,7 @@ $(CODELIB):
 
 .PHONY: $(CODELIB_SAPPORO)
 $(CODELIB_SAPPORO):
-	$(MAKE) -C src -j $(CPU_COUNT) gpulib CXX='$(MPICXX)' CFLAGS='$(CFLAGS)' SAPPORO_LIBDIRS='$(SAPPORO_LIGHT_CFLAGS)' SAPPORO_LIBS='$(SAPPORO_LIGHT_LIBS)'
+	$(MAKE) -C src -j $(CPU_COUNT) gpulib CXX='$(MPICXX)' CFLAGS='$(CFLAGS)'
 
 
 # Building the workers
@@ -42,6 +42,9 @@ ph4_worker: ph4_worker.o interface.o $(CODELIB)
 ph4_sapporo_worker: ph4_worker.o interface.o $(CODELIB_SAPPORO)
 	$(MPICXX) -o $@ $(LDFLAGS) $^ $(LDLIBS) $(SAPPORO_LIGHT_LIBS)
 
+ph4_sapporo2_worker: ph4_worker.o interface.o $(CODELIB_SAPPORO)
+	$(MPICXX) -o $@ $(LDFLAGS) $^ $(LDLIBS) -lsapporoG6 $(SAPPORO2_LIBS)
+
 %.o: %.cc
 	$(MPICXX) -o $@ -c $(CFLAGS) $<
 
@@ -51,6 +54,8 @@ amuse-ph4_contains: ph4_worker
 
 amuse-ph4-sapporo_contains: ph4_sapporo_worker
 
+amuse-ph4-sapporo2_contains: ph4_sapporo2_worker
+
 
 # Building and installing packages
 develop-%: %_contains

src/amuse_ph4/packages/amuse-ph4-sapporo2.amuse_deps

@@ -0,0 +1 @@
+c c++ mpi sapporo2

src/amuse_ph4/packages/amuse-ph4-sapporo2/amuse_ph4

@@ -0,0 +1 @@
+../..

src/amuse_ph4/packages/amuse-ph4-sapporo2/pyproject.toml

@@ -0,0 +1,43 @@
+[project]
+name = "amuse-ph4-sapporo2"
+dynamic = ["version"]
+requires-python = ">=3.7"
+dependencies = [
+    "amuse-framework",
+    "amuse-ph4"
+]
+
+[build-system]
+requires = ["hatchling", "versioningit"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "versioningit"
+
+[tool.versioningit.next-version]
+method = "smallest"
+
+[tool.versioningit.format]
+distance = "{next_version}.dev{distance}+{vcs}{rev}"
+dirty = "{base_version}+d{build_date:%Y%m%d}"
+distance-dirty = "{next_version}.dev{distance}+{vcs}{rev}.d{build_date:%Y%m%d}"
+
+[tool.versioningit.vcs]
+method = { module = "version_helper", value = "get_amuse_version", module-dir = "amuse_ph4/support/shared" }
+
+[tool.hatch.build]
+skip-excluded-dirs = true
+
+[tool.hatch.build.targets.wheel]
+include = ["amuse_ph4"]
+exclude = ["amuse_ph4/*"]
+artifacts = ["amuse_ph4/ph4_sapporo2_worker"]
+
+[tool.pytest.ini_options]
+pythonpath = ["amuse_ph4/tests/", "../../../tests"]
+
+testpaths = ["amuse_ph4/tests"]
+
+# Test the installed package, and only GPU tests.
+addopts = "--import-mode=append -k gpu"
+

src/amuse_ph4/src/grape.cc

@@ -20,6 +20,11 @@ extern "C" {
       return g6_npipes_();
   }
 
+  int g6_get_nj_max()
+  {
+      return g6_get_nj_max_();
+  }
+
   int g6_set_tunit(double t)
   {
       return g6_set_tunit_(&t);

src/amuse_ph4/src/grape.h

@@ -14,6 +14,9 @@ extern "C" {
   int g6_npipes_();
     int g6_npipes();
 
+  int g6_get_nj_max_();
+    int g6_get_nj_max();
+
   int g6_set_tunit_(double*);
     int g6_set_tunit(double t);
 

src/amuse_ph4/src/jdata.cc

@@ -34,7 +34,6 @@
 
 #ifdef GPU
 #include "grape.h"
-#include "sapporo.h"
 #endif
 
 // AMUSE STOPPING CONDITIONS SUPPORT

src/amuse_ph4/support/config.mk.in

@@ -29,3 +29,7 @@ FOUND_SAPPORO_LIGHT = @FOUND_SAPPORO_LIGHT@
 SAPPORO_LIGHT_CFLAGS = @SAPPORO_LIGHT_CFLAGS@
 SAPPORO_LIGHT_LIBS = @SAPPORO_LIGHT_LIBS@
 
+FOUND_SAPPORO2 = @FOUND_SAPPORO2@
+SAPPORO2_CFLAGS = @SAPPORO2_CFLAGS@
+SAPPORO2_LIBS = @SAPPORO2_LIBS@
+

src/amuse_ph4/support/configure

@@ -622,6 +622,9 @@ MPILIBS
 MPI_CLIBS
 MPI_CFLAGS
 MPICC
+FOUND_SAPPORO2
+SAPPORO2_LIBS
+SAPPORO2_CFLAGS
 FOUND_SAPPORO_LIGHT
 SAPPORO_LIGHT_LIBS
 SAPPORO_LIGHT_CFLAGS
@@ -720,6 +723,8 @@ STOPCOND_CFLAGS
 STOPCOND_LIBS
 SAPPORO_LIGHT_CFLAGS
 SAPPORO_LIGHT_LIBS
+SAPPORO2_CFLAGS
+SAPPORO2_LIBS
 MPICC
 MPICXX'
 
@@ -1364,6 +1369,10 @@ Some influential environment variables:
               C compiler flags for SAPPORO_LIGHT, overriding pkg-config
   SAPPORO_LIGHT_LIBS
               linker flags for SAPPORO_LIGHT, overriding pkg-config
+  SAPPORO2_CFLAGS
+              C compiler flags for SAPPORO2, overriding pkg-config
+  SAPPORO2_LIBS
+              linker flags for SAPPORO2, overriding pkg-config
   MPICC       MPI C compiler command
   MPICXX      MPI C++ compiler command
 
@@ -5256,6 +5265,211 @@ fi
 
 
 
+    amuse_save_LIBS="$LIBS"
+    amuse_save_LIB_CFLAGS="$SAPPORO2_CFLAGS"
+    amuse_save_LIB_LIBS="$SAPPORO2_LIBS"
+    amuse_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+
+    # If we have an active virtualenv, make sure pkg-config searches it
+    if test "a${VIRTUAL_ENV}" != "a"
+    then
+        PKG_CONFIG_PATH="${VIRTUAL_ENV}/lib/pkgconfig:${PKG_CONFIG_PATH}"
+    fi
+
+    # All AMUSE libs export C symbols
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+    # Search for the library, first directly then fall back to pkg-config
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing numberOfGPUUsedBySapporo" >&5
+printf %s "checking for library containing numberOfGPUUsedBySapporo... " >&6; }
+if test ${ac_cv_search_numberOfGPUUsedBySapporo+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char numberOfGPUUsedBySapporo ();
+int
+main (void)
+{
+return numberOfGPUUsedBySapporo ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' sapporo2
+do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_search_numberOfGPUUsedBySapporo=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext
+  if test ${ac_cv_search_numberOfGPUUsedBySapporo+y}
+then :
+  break
+fi
+done
+if test ${ac_cv_search_numberOfGPUUsedBySapporo+y}
+then :
+
+else $as_nop
+  ac_cv_search_numberOfGPUUsedBySapporo=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_numberOfGPUUsedBySapporo" >&5
+printf "%s\n" "$ac_cv_search_numberOfGPUUsedBySapporo" >&6; }
+ac_res=$ac_cv_search_numberOfGPUUsedBySapporo
+if test "$ac_res" != no
+then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+        FOUND_SAPPORO2="yes"
+        SAPPORO2_LIBS="$LIBS"
+        SAPPORO2_CFLAGS=""
+
+else $as_nop
+
+
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SAPPORO2" >&5
+printf %s "checking for SAPPORO2... " >&6; }
+
+if test -n "$SAPPORO2_CFLAGS"; then
+    pkg_cv_SAPPORO2_CFLAGS="$SAPPORO2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sapporo2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "sapporo2") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SAPPORO2_CFLAGS=`$PKG_CONFIG --cflags "sapporo2" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SAPPORO2_LIBS"; then
+    pkg_cv_SAPPORO2_LIBS="$SAPPORO2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sapporo2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "sapporo2") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SAPPORO2_LIBS=`$PKG_CONFIG --libs "sapporo2" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SAPPORO2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sapporo2" 2>&1`
+        else
+	        SAPPORO2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sapporo2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SAPPORO2_PKG_ERRORS" >&5
+
+
+            FOUND_SAPPORO2="no"
+
+elif test $pkg_failed = untried; then
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+            FOUND_SAPPORO2="no"
+
+else
+	SAPPORO2_CFLAGS=$pkg_cv_SAPPORO2_CFLAGS
+	SAPPORO2_LIBS=$pkg_cv_SAPPORO2_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+            FOUND_SAPPORO2="yes"
+
+fi
+
+fi
+
+
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+    PKG_CONFIG_PATH="$amuse_save_PKG_CONFIG_PATH"
+    LIBS="$amuse_save_LIBS"
+
+    # If we have an active CONDA environment, assume that the lib is coming from
+    # there and add an additional flag so that .mod files can be found. Only really
+    # needed for stopcond and forsockets, and hopefully conda-forge will give us a
+    # better solution soon.
+    if test "${FOUND_SAPPORO2}" == "yes" -a "x$CONDA_PREFIX" != "x"
+    then
+        SAPPORO2_CFLAGS="${SAPPORO2_CFLAGS} -I${CONDA_PREFIX}/include"
+    fi
+
+    # If the user overrode the variables, go with what they set instead of
+    # what we just detected.
+    if test "x$amuse_save_LIB_CFLAGS" != "x"
+then :
+
+        SAPPORO2_CFLAGS="$amuse_save_LIB_CFLAGS"
+
+fi
+    if test "x$amuse_save_LIB_LIBS" != "x"
+then :
+
+        SAPPORO2_LIBS="$amuse_save_LIB_LIBS"
+
+fi
+
+
+
+
+
+
+
+
 # Find external dependencies
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

src/amuse_ph4/support/configure.ac

@@ -27,6 +27,7 @@ AS_IF([test $RANLIB = ":"], [AC_MSG_ERROR([ranlib command not found.])])
 # Find AMUSE libraries
 AMUSE_LIB_STOPCOND()
 AMUSE_LIB_SAPPORO_LIGHT()
+AMUSE_LIB_SAPPORO2()
 
 
 # Find external dependencies