Merge branch 'main' into issue-1144-new-continuous-integration

Author: LourensVeen

lib/Makefile

@@ -1,5 +1,5 @@
 .PHONY: Makefile
-LIBS = $(filter-out Makefile sapporo_light, $(wildcard *))
+AMUSE_LIBS = $(filter-out Makefile sapporo_light, $(wildcard *))
 
 
 # We build sapporo_light separately and only on demand, because it needs CUDA and we
@@ -10,9 +10,9 @@ LIBS = $(filter-out Makefile sapporo_light, $(wildcard *))
 
 
 .PHONY: install uninstall clean distclean
-install uninstall clean distclean: $(LIBS)
+install uninstall clean distclean: $(AMUSE_LIBS)
 
-.PHONY: $(LIBS)
-$(LIBS):
+.PHONY: $(AMUSE_LIBS)
+$(AMUSE_LIBS):
 	$(MAKE) -C $@ $(MAKECMDGOALS)
 

lib/sapporo_light/sapporo.cpp

@@ -270,3 +270,8 @@ int sapporo::get_ngb_list(int cluster_id,
     sort(nbl, nbl + min(nblen, maxlength));
     return overflow;
 }
+
+int sapporo::get_nj_max() const
+{
+    return nj_max;
+}

lib/sapporo_light/sapporo.h

@@ -103,6 +103,7 @@ extern "C"
 {
   int  get_device_count();
   cudaError_t host_evaluate_gravity(sapporo_multi_struct);
+  int g6_get_nj_max_();
 }
 
 class sapporo {
@@ -169,7 +170,7 @@ class sapporo {
 
     predict = false;
     nj_modified = 0;
-    
+
     device.address_j = NULL;
 
     device.t_j   = NULL;
@@ -182,13 +183,15 @@ class sapporo {
     device.acc_i = NULL;
     device.vel_i = NULL;
     device.jrk_i = NULL;
+
 
   };
   ~sapporo() {};
 
   int open(int cluster_id);
   int close(int cluster_id);
   int get_n_pipes();
+  int get_nj_max() const;
   int set_ti(int cluster_id, double ti);
 
   int set_j_particle(int cluster_id,

lib/sapporo_light/sapporoG6lib.cpp

@@ -49,6 +49,9 @@ extern "C" {
     return grav.calc_lasthalf2(*cluster_id, *nj, *ni,
 			       index, xi, vi, *eps2, h2, acc, jerk, pot, inn);
   }
+  int g6_get_nj_max_() {
+    return grav.get_nj_max();
+  }
 
   int g6_initialize_jp_buffer_(int* cluster_id, int* buf_size) {return 0;}
   int g6_flush_jp_buffer_(int* cluster_id) {return 0;}
@@ -80,4 +83,3 @@ extern "C" {
 
 
 }
-

lib/sapporo_light/send_fetch_data.cpp

@@ -65,6 +65,11 @@ void sapporo::send_j_particles_to_device(int ignore) {
     dev_struct &dev = device;
 
     int nj = address_j.size();
+
+    if (nj > nj_max) {
+      fprintf(stdout, "ERROR: nj = %d exceeds GPU capacity nj_max = %d\n", nj, nj_max);
+      abort;
+    }
 
     CUDA_SAFE_CALL(cudaMemcpy( dev.address_j,      &address_j[0], nj * sizeof(int),    cudaMemcpyHostToDevice));
     CUDA_SAFE_CALL(cudaMemcpy( &dev.t_j  [nj_max], &t_j[0],       nj * sizeof(DS2),    cudaMemcpyHostToDevice));

src/amuse/support/options.py

@@ -7,11 +7,6 @@
 from amuse.support.core import late
 from amuse.support import exceptions
 
-try:
-    import pkg_resources
-except ImportError:
-    pkg_resources = None
-
 
 class GlobalOptions:
     INSTANCE = None
@@ -21,11 +16,6 @@ def __init__(self):
         self.overriden_options = {}
 
     def load(self, preloadfp=None):
-        if pkg_resources is not None:
-            if pkg_resources.resource_exists("amuse", "amuserc"):
-                resourcerc = pkg_resources.resource_filename("amuse", "amuserc")
-                self.config.read(resourcerc)
-
         rootrc = os.path.join(self.amuse_rootdirectory, self.rcfilename)
         self.config.read(rootrc)
 

src/amuse_gadget2/Makefile

@@ -24,9 +24,12 @@ build_%:
 build_%/makefile_options: makefile_options_% | build_%
 	cp makefile_options_$* $@
 
-build_%/$(CODELIB) build_%/allvars.o &: build_%/makefile_options FORCE
+build_%/$(CODELIB): build_%/makefile_options FORCE
 	$(MAKE) -C build_$* -f ../src/Makefile -j $(CPU_COUNT) all VPATH=../src
 
+build_%/allvars.o: build_%/$(CODELIB) FORCE
+	@true
+
 
 # Load code configuration
 OPT :=

src/amuse_mesa_r15140/Makefile

@@ -114,6 +114,7 @@ src/bin/fpx3_deps: | src/fpx3_deps
 
 $(MESA_DIR)/utils/makedepf90-2.8.8: | $(MESA_DIR)
 	cd $(MESA_DIR)/utils && tar xzf makedepf90-2.8.8.tar.gz -m
+    touch $(MESA_DIR)/utils/makedepf90-2.8.8/configure
 
 src/bin/makedepf90: | $(MESA_DIR)/utils/makedepf90-2.8.8 src/bin
 	touch $(MESA_DIR)/utils/makedepf90-2.8.8/configure

src/amuse_ph4/interface.cc

@@ -936,3 +936,9 @@ int get_id_of_updated_particle(int index, int * index_of_particle, int * status)
     *status = jd->UpdatedParticles[index].status;
     return 0;
 }
+
+int get_nj_max(int * value)
+{
+  *value = jd->get_nj_max();
+  return 0;
+}

src/amuse_ph4/interface.py

@@ -464,6 +464,13 @@ def recompute_timesteps():
         function.result_type = 'int32'
         return function
 
+    @legacy_function
+    def get_nj_max():
+        function = LegacyFunctionSpecification()
+        function.addParameter('nj_max', dtype='int32',
+                              direction=function.OUT)
+        function.result_type = 'int32'
+        return function
 
 class ph4(GravitationalDynamics,GravityFieldCode):