Fix GPI-2 and enable TAGASPI
The rdma-core driver.h include is no longer installed:
 56dd87acd2
So ibv_read_sysfs_file() is not defined. As the symbols is still
distributed, we simply add the missing prototype manually.
Similarly, the gaspi_size_t gaspi_get_system_mem() function is not
available from the gaspi public headers, so we define it in the
max_mem.c test.
Fixes: #7
			
			
This commit is contained in:
		
							parent
							
								
									2c8d7ed855
								
							
						
					
					
						commit
						9c04aabd7a
					
				| @ -18,7 +18,7 @@ let | |||||||
|     clangOmpss2NodesOmpv = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; openmp = final.openmpv; }; |     clangOmpss2NodesOmpv = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; openmp = final.openmpv; }; | ||||||
|     clangOmpss2Unwrapped = callPackage ./pkgs/llvm-ompss2/clang.nix { }; |     clangOmpss2Unwrapped = callPackage ./pkgs/llvm-ompss2/clang.nix { }; | ||||||
|     #extrae = callPackage ./pkgs/extrae/default.nix { }; # Broken and outdated |     #extrae = callPackage ./pkgs/extrae/default.nix { }; # Broken and outdated | ||||||
|     #gpi-2 = callPackage ./pkgs/gpi-2/default.nix { }; # Broken: https://jungle.bsc.es/git/rarias/bscpkgs/issues/7 |     gpi-2 = callPackage ./pkgs/gpi-2/default.nix { }; | ||||||
|     intelPackages_2023 = callPackage ./pkgs/intel-oneapi/2023.nix { }; |     intelPackages_2023 = callPackage ./pkgs/intel-oneapi/2023.nix { }; | ||||||
|     jemallocNanos6 = callPackage ./pkgs/nanos6/jemalloc.nix { }; |     jemallocNanos6 = callPackage ./pkgs/nanos6/jemalloc.nix { }; | ||||||
|     lmbench = callPackage ./pkgs/lmbench/default.nix { }; |     lmbench = callPackage ./pkgs/lmbench/default.nix { }; | ||||||
| @ -44,7 +44,7 @@ let | |||||||
|     stdenvClangOmpss2Nanos6 = final.stdenv.override { cc = final.clangOmpss2Nanos6; allowedRequisites = null; }; |     stdenvClangOmpss2Nanos6 = final.stdenv.override { cc = final.clangOmpss2Nanos6; allowedRequisites = null; }; | ||||||
|     stdenvClangOmpss2Nodes = final.stdenv.override { cc = final.clangOmpss2Nodes; allowedRequisites = null; }; |     stdenvClangOmpss2Nodes = final.stdenv.override { cc = final.clangOmpss2Nodes; allowedRequisites = null; }; | ||||||
|     stdenvClangOmpss2NodesOmpv = final.stdenv.override { cc = final.clangOmpss2NodesOmpv; allowedRequisites = null; }; |     stdenvClangOmpss2NodesOmpv = final.stdenv.override { cc = final.clangOmpss2NodesOmpv; allowedRequisites = null; }; | ||||||
|     #tagaspi = callPackage ./pkgs/tagaspi/default.nix { }; # Broken due gpi-2 |     tagaspi = callPackage ./pkgs/tagaspi/default.nix { }; | ||||||
|     tampi = callPackage ./pkgs/tampi/default.nix { }; |     tampi = callPackage ./pkgs/tampi/default.nix { }; | ||||||
|     wxparaver = callPackage ./pkgs/paraver/default.nix { }; |     wxparaver = callPackage ./pkgs/paraver/default.nix { }; | ||||||
|   }; |   }; | ||||||
|  | |||||||
| @ -34,6 +34,8 @@ stdenv.mkDerivation rec { | |||||||
| 
 | 
 | ||||||
|   enableParallelBuilding = true; |   enableParallelBuilding = true; | ||||||
| 
 | 
 | ||||||
|  |   patches = [ ./rdma-core.patch ./max-mem.patch ]; | ||||||
|  | 
 | ||||||
|   preConfigure = '' |   preConfigure = '' | ||||||
|     patchShebangs autogen.sh |     patchShebangs autogen.sh | ||||||
|     ./autogen.sh |     ./autogen.sh | ||||||
|  | |||||||
							
								
								
									
										10
									
								
								pkgs/gpi-2/max-mem.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								pkgs/gpi-2/max-mem.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,10 @@ | |||||||
|  | --- a/tests/tests/segments/max_mem.c	2025-09-12 13:30:53.449353591 +0200
 | ||||||
|  | +++ b/tests/tests/segments/max_mem.c	2025-09-12 13:33:49.750352401 +0200
 | ||||||
|  | @@ -1,5 +1,7 @@
 | ||||||
|  |  #include <test_utils.h> | ||||||
|  |   | ||||||
|  | +gaspi_size_t gaspi_get_system_mem (void);
 | ||||||
|  | +
 | ||||||
|  |  /* Test allocates 45% of system memory and creates a segment that | ||||||
|  |     large or if several ranks per node exist, divided among that | ||||||
|  |     number */ | ||||||
							
								
								
									
										12
									
								
								pkgs/gpi-2/rdma-core.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								pkgs/gpi-2/rdma-core.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,12 @@ | |||||||
|  | --- a/src/devices/ib/GPI2_IB.h	2025-09-12 13:25:31.564181121 +0200
 | ||||||
|  | +++ b/src/devices/ib/GPI2_IB.h	2025-09-12 13:24:49.105422150 +0200
 | ||||||
|  | @@ -26,6 +26,9 @@ along with GPI-2. If not, see <http://ww
 | ||||||
|  |   | ||||||
|  |  #include "GPI2_Dev.h" | ||||||
|  |   | ||||||
|  | +/* Missing prototype as driver.h is now private */
 | ||||||
|  | +int ibv_read_sysfs_file(const char *dir, const char *file, char *buf, size_t size);
 | ||||||
|  | +
 | ||||||
|  |  #define GASPI_GID_INDEX   (0) | ||||||
|  |  #define PORT_LINK_UP      (5) | ||||||
|  |  #define MAX_INLINE_BYTES  (128) | ||||||
		Reference in New Issue
	
	Block a user