Merge branch 'develop' into 316-invert_mask-descriptor-inverts-return-value-to-true-for-unassigned-elements

Author: GiovaGa

.gitignore

@@ -5,3 +5,7 @@ doxygen.log
 /lib/
 flags.mk
 paths.mk
+[Bb]uild*/
+[Oo]bj*/
+[Ii]nstall*/
+cmake-build-*/

.gitlab-ci.yml

@@ -24,6 +24,36 @@ variables:
       - "yes"
       - "no"
     description: "Enable compilation using multiple compilers"
+  SLURM_TESTS_ENABLED:
+    value: "no"
+    options:
+      - "yes"
+      - "no"
+    description: "Enable test on the Slurm cluster"
+  CI_SLURM_PARTITION:
+    value: "Zen3"
+    description: "Partition to use (if using Slurm)"
+  CI_SLURM_NNODES:
+    value: "1"
+    description: "Number of nodes to request (if using Slurm)"
+  CI_SLURM_NTASKS:
+    value: "1"
+    description: "Number of tasks to request (if using Slurm)"
+  CI_SLURM_CPUS_PER_TASK:
+    value: "64"
+    description: "Number of CPUs per task (if using Slurm)"
+  CI_SLURM_MEM_PER_NODE:
+    value: "64G"
+    description: "Memory per node (if using Slurm)"
+  CI_SLURM_TIMELIMIT:
+    value: "00-10:00:00" # 10 hours
+    description: "Time limit for the job (if using Slurm)"
+  SLURM_JOB_START_TIMEOUT_SECONDS:
+    value: "3600" # 1 hour timeout to switch from PENDING to RUNNING
+    description: "Allowed time for the job to switch from PENDING to RUNNING (if using Slurm)"
+  SLURM_DATASETS_DIR_PATH:
+    value: "/storage/datasets/graphs-and-sparse-matrices"
+    description: "Path to the datasets directory (if using Slurm)"
   COVERAGE_ENABLED:
     value: "no"
     options:
@@ -237,6 +267,28 @@ gitleaks:
   script: gitleaks detect -v --source .
 
 
+## Jobs running on Slurm cluster
+
+# factored out command to download the datasets, cmake, and build in non-debug mode
+.setup_and_build_ndebug_slurm: &setup_and_build_ndebug_slurm
+  - mkdir -p install build && cd ./build
+  - ../bootstrap.sh --prefix=../install --with-datasets=${SLURM_DATASETS_DIR_PATH} --no-hyperdags
+  - make -j$(nproc)
+
+tests_performance_slurm:
+  rules:
+    - if: $SLURM_TESTS_ENABLED == "yes"
+  tags:
+    - slurm
+  script:
+    - *setup_and_build_ndebug_slurm
+    - make -j$(nproc) performancetests |& tee performancetests.log
+    - ../tests/summarise.sh performancetests.log tests/performance/output/benchmarks tests/performance/output/scaling
+  artifacts:
+    paths: [ build/*.log ]
+    expire_in: 1 month
+
+
 ## Additional tests specific to main branches only
 
 tests_performance:
@@ -363,7 +415,7 @@ coverage_matrix:
     - echo "-- NONBLOCKING=${backends_array[3]}"
 
     - rm -rf build install && mkdir -p install build && cd build
-    - cmake -DCMAKE_INSTALL_PREFIX='../install' 
+    - cmake -DCMAKE_INSTALL_PREFIX='../install'
       -DCMAKE_BUILD_TYPE=Coverage
       -DDATASETS_DIR=${ALP_DATASETS}
       -DWITH_HYPERDAGS_BACKEND=${backends_array[0]}

Makefile

@@ -80,7 +80,7 @@ include/graphblas/base/exec.hpp \
 include/graphblas/base/init.hpp \
 include/graphblas/base/collectives.hpp \
 include/graphblas/base/benchmark.hpp \
-include/graphblas/utils/alloc.hpp \
+include/graphblas/alloc.hpp \
 include/graphblas/utils/config.hpp \
 include/graphblas/utils/hpparser.h \
 include/graphblas/utils/parser.hpp \

NOTICE

@@ -21,7 +21,7 @@ to Huawei Technologies Co., Ltd. or one of its subsidiaries:
 
  - Aristeidis Mastoras, Huawei Technologies Switzerland AG; 2020-current.
 
- - Alberto Scolari, Huawei Technologies Switzerland AG; 2021-current.
+ - Alberto Scolari, Huawei Technologies Switzerland AG; 2021-2025.
 
  - Verner Vlacic, Huawei Technologies Switzerland AG; 2021-current.
 
@@ -34,6 +34,10 @@ to Huawei Technologies Co., Ltd. or one of its subsidiaries:
  - Denis Jelovina, Huawei Technologies Switzerland AG; 2022-current.
 
  - Benjamin Lozes, Huawei Technologies Switzerland AG; 2023.
+ 
+ - Christos Konstantinos Matzoros, Huawei Technologies Switzerland AG; 2024-current.
+
+ - Giovanni Gaio, Huawei Technologies Switzerland AG; 2025-current.
 
 The experimental banshee backend has been developed in collaboration with
 Prof. Luca Benini at ETH Zuerich and his group. In particular this backend

docs/Suppressions.md

@@ -82,3 +82,30 @@ for( size_t k = 0; k < block_size; ++k ) {
 }
 ```
 
+7. `include/graphblas/reference/blas1.hpp`, masked_apply_generic
+```
+for( size_t k = 0; k < block_size; ++k ) {
+	if( mask_b[ k ] ) {
+		apply( z_b[ k ], x_b[ k ], y_b[ k ], op );
+	}
+}
+for( size_t k = 0; k < block_size; ++k ) {
+	const size_t index = i + k;
+	assert( index < n );
+	if( mask_b[ k ] ) {
+#ifdef _H_GRB_REFERENCE_OMP_BLAS1
+		if( !z_coors.asyncAssign( index, update ) ) {
+				(void) ++asyncAssigns;
+		}
+#else
+		(void) z_coors.assign( index );
+#endif
+		GRB_UTIL_IGNORE_MAYBE_UNINITIALIZED
+		// z_b[ k ] has been initialized in the loop just before
+		*( z_p + index ) = z_b[ k ];
+		GRB_UTIL_RESTORE_WARNINGS
+	}
+}
+#ifdef _H_GRB_REFERENCE_OMP_BLAS1
+
+```

docs/user.conf

@@ -874,6 +874,7 @@ INPUT                  = include/graphblas.hpp \
                          include/graphblas/monoid.hpp \
                          include/graphblas/iomode.hpp \
                          include/graphblas/ops.hpp \
+                         include/graphblas/selection_ops.hpp \
                          include/graphblas/descriptors.hpp \
                          include/graphblas/rc.hpp \
                          include/graphblas/reference/config.hpp \

include/CMakeLists.txt

@@ -41,18 +41,19 @@ set( HEADERS_REGEX ".+\.(hpp|h|hxx|hh|h\\+\\+)$" )
 # to avoid flaky acrobatics with regex or glob expressions, copy main files directly
 install( FILES "graphblas.hpp" DESTINATION "${INCLUDE_INSTALL_DIR}" )
 set( root_files
-	"graphblas/backends.hpp" "graphblas/benchmark.hpp"
+	"graphblas/alloc.hpp" "graphblas/backends.hpp" "graphblas/benchmark.hpp"
 	"graphblas/blas0.hpp" "graphblas/blas1.hpp" "graphblas/blas2.hpp"
 	"graphblas/blas3.hpp" "graphblas/collectives.hpp" "graphblas/config.hpp"
-	"graphblas/coordinates.hpp" "graphblas/descriptors.hpp" "graphblas/distribution.hpp"
-	"graphblas/exec.hpp" "graphblas/identities.hpp" "graphblas/init.hpp"
-	"graphblas/internalops.hpp" "graphblas/io.hpp" "graphblas/iomode.hpp"
-	"graphblas/matrix.hpp" "graphblas/monoid.hpp" "graphblas/ops.hpp"
-	"graphblas/phase.hpp" "graphblas/pinnedvector.hpp" "graphblas/properties.hpp"
-	"graphblas/rc.hpp" "graphblas/semiring.hpp" "graphblas/spmd.hpp"
-	"graphblas/tags.hpp" "graphblas/type_traits.hpp" "graphblas/utils.hpp"
-	"graphblas/vector.hpp" "graphblas/synchronizedNonzeroIterator.hpp"
-	"graphblas/nonzeroStorage.hpp"
+	"graphblas/coordinates.hpp" "graphblas/descriptors.hpp"
+	"graphblas/distribution.hpp" "graphblas/exec.hpp" "graphblas/final.hpp"
+	"graphblas/identities.hpp" "graphblas/init.hpp" "graphblas/internalops.hpp"
+	"graphblas/io.hpp" "graphblas/iomode.hpp" "graphblas/matrix.hpp"
+	"graphblas/monoid.hpp" "graphblas/ops.hpp" "graphblas/phase.hpp"
+	"graphblas/pinnedvector.hpp" "graphblas/properties.hpp" "graphblas/rc.hpp"
+	"graphblas/semiring.hpp" "graphblas/spmd.hpp" "graphblas/tags.hpp"
+	"graphblas/type_traits.hpp" "graphblas/utils.hpp" "graphblas/vector.hpp"
+	"graphblas/synchronizedNonzeroIterator.hpp" "graphblas/nonzeroStorage.hpp"
+	"graphblas/selection_ops.hpp"
 )
 
 set( GRB_INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}/graphblas")

include/graphblas.hpp

@@ -170,6 +170,12 @@
  *  -# #grb::Monoid, and
  *  -# #grb::Semiring.
  *
+ * A list of standard operators, monoids, and semirings are provided in their
+ * respective name spaces:
+ *  -# #grb::operators,
+ *  -# #grb::monoids, and
+ *  -# #grb::semirings.
+ *
  * Binary operators are parametrised in two input domains and one output domain,
  * \f$ D_1 \times D_2 \to D_3 \f$. The \f$ D_i \f$ are given as template
  * arguments to the operator. A #grb::Monoid is composed from a binary operator
@@ -513,6 +519,7 @@ namespace grb {
 #include <graphblas/ops.hpp>
 #include <graphblas/monoid.hpp>
 #include <graphblas/semiring.hpp>
+#include <graphblas/selection_ops.hpp>
 
 // Then include containers. If containers rely on ALP/GraphBLAS primitives that
 // are defined as free functions, then container implementations must forward-